生产总订单-字段更改

src/views/production/productionTotalOrder/modules/Outbound.vue → src/views/production/productionTotalOrder/modules/SurplusMaterials.vue

@@ -14,183 +14,177 @@
             :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
             @change="handleTableChange"
             >
-                <template slot="projectCode" slot-scope="text, record, index">
-                    <a-form-model-item prop="projectCode" class='sonItem'>
-                        <a-input placeholder="请输入" v-model="record.projectCode" disabled></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></a-input>
-                    </a-form-model-item>
-                </template>
                 <template slot="batch" slot-scope="text, record, index">
                     <a-form-model-item prop="batch" class='sonItem'>
-                        <a-input placeholder="请输入" v-model="record.batch" disabled></a-input>
+                        <a-input placeholder="请输入" v-model="record.batch" ></a-input>
                     </a-form-model-item>
                 </template> 
                 <template slot="inventoryCode" slot-scope="text, record, index">
                     <a-form-model-item prop="inventoryCode" class='sonItem'>
-                        <a-input placeholder="请输入" v-model="record.inventoryCode" disabled></a-input>
-                    </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></a-input>
+                        <a-input-search placeholder="请输入" v-model="record.inventoryCode" @search="onSearchInven(record)" readOnly></a-input-search>
                     </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></a-input>
-                     </a-form-model-item>
-                </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></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></a-input>
+                        <a-input placeholder="请输入" v-model="record.quantity" ></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></a-input>
-                     </a-form-model-item>
-                </template>
-                <template slot="quantityExecute" slot-scope="text, record, index">
-                    <a-form-model-item prop="quantityExecute" class='sonItem'>
-                        <a-input placeholder="请输入" v-model="record.quantityExecute" disabled></a-input>
-                     </a-form-model-item>
-                </template>
-                <template slot="unQuantityExecute" slot-scope="text, record, index">
-                    <a-form-model-item prop="unQuantityExecute" class='sonItem'>
-                        <a-input placeholder="请输入" v-model="record.unQuantityExecute" disabled></a-input>
+                        <a-input placeholder="请输入" v-model="record.unQuantity" ></a-input>
                      </a-form-model-item>
                 </template>
                 <template slot="model" slot-scope="text, record, index">
                     <a-form-model-item prop="model" class='sonItem'>
-                        <a-input placeholder="请输入" v-model="record.model" disabled></a-input>
+                        <a-input placeholder="请输入" v-model="record.model" ></a-input>
                      </a-form-model-item>
                 </template>
                 <template slot="color" slot-scope="text, record, index">
                     <a-form-model-item prop="color" class='sonItem'>
-                        <a-input placeholder="请输入" v-model="record.color" :disabled="allowEditColor=='no'" @change='changeOutColor'></a-input>
+                        <a-input placeholder="请输入" v-model="record.color" ></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" ></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></a-input>
+                        <a-input placeholder="请输入" v-model="record.fixedLength" ></a-input>
+                     </a-form-model-item>
+                </template>
+                <template slot="widthHeight" slot-scope="text, record, index">
+                    <a-form-model-item prop="widthHeight" class='sonItem'>
+                        <a-input placeholder="请输入" v-model="record.widthHeight" ></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></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" ></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></a-input>
+                <template slot="remarks" slot-scope="text, record, index">
+                    <a-form-model-item prop="remarks" class='sonItem'>
+                        <a-input placeholder="请输入" v-model="record.remarks" ></a-input>
+                     </a-form-model-item>
+                </template>
+                <template slot="rate" slot-scope="text, record, index">
+                    <a-form-model-item prop="rate" class='sonItem'>
+                        <a-input placeholder="请输入" v-model="record.rate" ></a-input>
                      </a-form-model-item>
                 </template>
                 <template slot="meterWeight" slot-scope="text, record, index">
                     <a-form-model-item prop="meterWeight" class='sonItem'>
-                        <a-input placeholder="请输入" v-model="record.meterWeight" disabled></a-input>
+                        <a-input placeholder="请输入" v-model="record.meterWeight" ></a-input>
                      </a-form-model-item>
                 </template>
                 <template slot="decorationLength" slot-scope="text, record, index">
                     <a-form-model-item prop="decorationLength" class='sonItem'>
-                        <a-input placeholder="请输入" v-model="record.decorationLength" disabled></a-input>
+                        <a-input placeholder="请输入" v-model="record.decorationLength" ></a-input>
                      </a-form-model-item>
                 </template>
                 <template slot="windowNo" slot-scope="text, record, index">
                     <a-form-model-item prop="windowNo" class='sonItem'>
-                        <a-input placeholder="请输入" v-model="record.windowNo" disabled></a-input>
+                        <a-input placeholder="请输入" v-model="record.windowNo" ></a-input>
                      </a-form-model-item>
                 </template>
                 <template slot="exclusiveZone" slot-scope="text, record, index">
                     <a-form-model-item prop="exclusiveZone" class='sonItem'>
-                        <a-input placeholder="请输入" v-model="record.exclusiveZone" disabled></a-input>
+                        <a-input placeholder="请输入" v-model="record.exclusiveZone" ></a-input>
                      </a-form-model-item>
                 </template>
-                <template slot="width" slot-scope="text, record, index">
-                    <a-form-model-item prop="width" class='sonItem'>
-                        <a-input placeholder="请输入" v-model="record.width" disabled></a-input>
+                <template slot="widthLength" slot-scope="text, record, index">
+                    <a-form-model-item prop="widthLength" class='sonItem'>
+                        <a-input placeholder="请输入" v-model="record.widthLength" ></a-input>
                      </a-form-model-item>
                 </template>
                 <template slot="height" slot-scope="text, record, index">
                     <a-form-model-item prop="height" class='sonItem'>
-                        <a-input placeholder="请输入" v-model="record.height" disabled></a-input>
+                        <a-input placeholder="请输入" v-model="record.height" ></a-input>
                      </a-form-model-item>
                 </template>
                 <template slot="buildingNumber" slot-scope="text, record, index">
                     <a-form-model-item prop="buildingNumber" class='sonItem'>
-                        <a-input placeholder="请输入" v-model="record.buildingNumber" disabled></a-input>
+                        <a-input placeholder="请输入" v-model="record.buildingNumber" ></a-input>
                      </a-form-model-item>
                 </template>
                 <template slot="framesTang" slot-scope="text, record, index">
                     <a-form-model-item prop="framesTang" class='sonItem'>
-                        <a-input placeholder="请输入" v-model="record.framesTang" disabled></a-input>
+                        <a-input placeholder="请输入" v-model="record.framesTang" ></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></a-input>
+                        <a-input placeholder="请输入" v-model="record.framesCount" ></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" ></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></a-input>
+                        <a-input placeholder="请输入" v-model="record.semiClass" ></a-input>
                      </a-form-model-item>
                 </template>
                 <template slot="area" slot-scope="text, record, index">
                     <a-form-model-item prop="area" class='sonItem'>
-                        <a-input placeholder="请输入" v-model="record.area" disabled></a-input>
+                        <a-input placeholder="请输入" v-model="record.area" ></a-input>
                      </a-form-model-item>
                 </template>
                 <template slot="cuttingLength" slot-scope="text, record, index">
                     <a-form-model-item prop="cuttingLength" class='sonItem'>
-                        <a-input placeholder="请输入" v-model="record.cuttingLength" disabled></a-input>
+                        <a-input placeholder="请输入" v-model="record.cuttingLength" ></a-input>
                      </a-form-model-item>
                 </template>
                 <template slot="cuttingLeftDown" slot-scope="text, record, index">
                     <a-form-model-item prop="cuttingLeftDown" class='sonItem'>
-                        <a-input placeholder="请输入" v-model="record.cuttingLeftDown" disabled></a-input>
+                        <a-input placeholder="请输入" v-model="record.cuttingLeftDown" ></a-input>
                      </a-form-model-item>
                 </template>
                 <template slot="cuttingRightTop" slot-scope="text, record, index">
                     <a-form-model-item prop="cuttingRightTop" class='sonItem'>
-                        <a-input placeholder="请输入" v-model="record.cuttingRightTop" disabled></a-input>
+                        <a-input placeholder="请输入" v-model="record.cuttingRightTop" ></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></a-input>
+                        <a-input placeholder="请输入" v-model="record.series" ></a-input>
+                     </a-form-model-item>
+                </template>
+                <template slot="glassNumber" slot-scope="text, record, index">
+                    <a-form-model-item prop="glassNumber" class='sonItem'>
+                        <a-input placeholder="请输入" v-model="record.glassNumber" ></a-input>
                      </a-form-model-item>
                 </template>
             </a-table>
         </a-form-model>
+        <inventoryPopup ref="inventoryPopup" @okData="okDataInvent"></inventoryPopup>
     </div>
   </template>
   
   <script>
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import JEllipsis from '@/components/jeecg/JEllipsis'
+  import inventoryPopup from '../../Popup/inventoryPopup.vue'
   import moment from 'moment'
   export default {
-    name: 'Outbound', //  Tabs 详情
+    name: 'SurplusMaterials', //  Tabs 详情
     mixins: [JeecgListMixin],
     components: {
       JEllipsis,
       moment,
+      inventoryPopup,
     },
     data() {
       return {
         selectedRowKeys:[],
         selectedRows:[],
+        planOrg:'',
         dataSource:[],
-        allowEditColor:'no',
         columns: [
                 {
                     title: '#',
@@ -207,14 +201,12 @@
                     align:"center",
                     dataIndex: 'projectCode',
                     ellipsis: true,
-                    scopedSlots: { customRender: 'projectCode' } 
                 },
                 {
                     title: '项目名称',
                     align:"center",
                     dataIndex: 'projectName',
                     ellipsis: true,
-                    scopedSlots: { customRender: 'projectName' } 
                 },
                 {
                     title: '批次',
@@ -224,7 +216,7 @@
                     scopedSlots: { customRender: 'batch' } 
                 },
                 {
-                    title: '存货编码',
+                    title: '料品编码',
                     align:"center",
                     dataIndex: 'inventoryCode',
                     ellipsis: true,
@@ -232,41 +224,31 @@
 
                 },
                 {
-                    title: '存货名称',
+                    title: '料品名称',
                     align:"center",
                     dataIndex: 'inventoryName',
                     ellipsis: true,
-                    scopedSlots: { customRender: 'inventoryName' } 
-
                 },
                 {
                     title: '计量单位',
                     align:"center",
                     dataIndex: 'unit',
                     ellipsis: true,
-                    scopedSlots: { customRender: 'unit' } 
-
-                },
-                {
-                    title: '主数量',
-                    align:"center",
-                    dataIndex: 'quantity',
-                    ellipsis: true,
-                    scopedSlots: { customRender: 'quantity' } 
 
                 },
                 {
-                    title: '换算率',
+                    title: '辅计量单位',
                     align:"center",
-                    dataIndex: 'rate',
+                    dataIndex: 'auxiliaryUnit',
                     ellipsis: true,
                 },
                 {
-                    title: '辅计量单位',
+                    title: '主数量',
                     align:"center",
-                    dataIndex: 'auxiliaryUnit',
+                    dataIndex: 'quantity',
                     ellipsis: true,
-                    scopedSlots: { customRender: 'auxiliaryUnit' } 
+                    scopedSlots: { customRender: 'quantity' } 
+
                 },
                 {
                     title: '辅数量',
@@ -276,18 +258,10 @@
                     scopedSlots: { customRender: 'unQuantity' } 
                 },
                 {
-                    title: '已执行主数量',
+                    title: '规格',
                     align:"center",
-                    dataIndex: 'quantityExecute',
+                    dataIndex: 'specs',
                     ellipsis: true,
-                    scopedSlots: { customRender: 'quantityExecute' } 
-                },
-                {
-                    title: '已执行辅数量',
-                    align:"center",
-                    dataIndex: 'unQuantityExecute',
-                    ellipsis: true,
-                    scopedSlots: { customRender: 'unQuantityExecute' } 
                 },
                 {
                     title: '型号',
@@ -304,6 +278,13 @@
                     scopedSlots: { customRender: 'color' } 
 
                 },
+                {   
+                    title: '支数',
+                    align:"center",
+                    dataIndex: 'fixedNum',
+                    ellipsis: true,
+                    scopedSlots: { customRender: 'fixedNum' } 
+                },
                 {   
                     title: '定尺',
                     align:"center",
@@ -312,18 +293,32 @@
                     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: '换算率',
+                    align:"center",
+                    dataIndex: 'rate',
+                    ellipsis: true,
+                    scopedSlots: { customRender: 'rate' } 
                 },
                 {
                     title: '米重',
@@ -354,11 +349,11 @@
                     scopedSlots: { customRender: 'exclusiveZone' } 
                 },
                 {
-                    title: '宽度',
+                    title: '宽度/长度',
                     align:"center",
-                    dataIndex: 'width',
+                    dataIndex: 'widthLength',
                     ellipsis: true,
-                    scopedSlots: { customRender: 'width' } 
+                    scopedSlots: { customRender: 'widthLength' } 
                 },
                 {
                     title: '高度',
@@ -389,6 +384,13 @@
                     ellipsis: true,
                     scopedSlots: { customRender: 'framesCount' } 
                  },
+                 {
+                    title: '扇统计',
+                    align:"center",
+                    dataIndex: 'leafCount',
+                    ellipsis: true,
+                    scopedSlots: { customRender: 'leafCount' } 
+                 },
                 {
                     title: '半成品分类',
                     align:"center",
@@ -424,6 +426,7 @@
                     ellipsis: true,
                     scopedSlots: { customRender: 'cuttingRightTop' } 
                 },
+                
                 {
                     title: '系列',
                     align:"center",
@@ -431,6 +434,13 @@
                     ellipsis: true,
                     scopedSlots: { customRender: 'series' } 
                 },
+                {
+                    title: '玻璃编号',
+                    align:"center",
+                    dataIndex: 'glassNumber',
+                    ellipsis: true,
+                    scopedSlots: { customRender: 'glassNumber' } 
+                },
           ],
       }
     },
@@ -444,8 +454,8 @@
             this.selectedRowKeys = selectedRowKeys;
             this.selectedRows = selectionRows;
         },
-        addList(){
-            this.dataSource.unshift({rowNo: this.dataSource.length+1})
+        addList(projectCode,projectName){
+            this.dataSource.unshift({rowNo: this.dataSource.length+1,projectCode:projectCode,projectName:projectName})
         },
         delectRow(){
             if( this.selectedRowKeys.length==0){
@@ -456,9 +466,23 @@
                 })
             }
         },
-        changeOutColor(){
-            this.$emit('changeOutColor')
-        }
+        onSearchInven(record){
+            if(this.planOrg==''||!this.planOrg){
+                this.$message.warning('请选择生产组织！')
+            }else{
+                this.$refs.inventoryPopup.visible = true
+                this.$refs.inventoryPopup.getData(this.planOrg)
+                this.$refs.inventoryPopup.record=record
+            }
+        },
+        okDataInvent(data,recoerd){
+            this.$set(recoerd,'inventoryCode',data.Code)
+            this.$set(recoerd,'inventoryName',data.Name)
+            this.$set(recoerd,'specs',data.SPECS)
+            this.$set(recoerd,'unit',data.unit)
+            this.$set(recoerd,'auxiliaryUnit',data.auxiliaryUnit )
+            this.$set(recoerd,'inventory',data.ID )
+        },
     },
   
     computed: {

src/views/production/productionTotalOrder/modules/WarehousingDetail.vue → src/views/production/productionTotalOrder/modules/SurplusMaterialsDetail.vue

@@ -25,7 +25,7 @@
   import JEllipsis from '@/components/jeecg/JEllipsis'
   import moment from 'moment'
   export default {
-    name: 'WarehousingDetail', //  Tabs 详情
+    name: 'SurplusMaterialsDetail', //  Tabs 详情
     mixins: [JeecgListMixin],
     components: {
       JEllipsis,
@@ -37,7 +37,7 @@
         selectedRows:[],
         dataSource:[],
         columns: [
-                {
+        {
                     title: '#',
                     dataIndex: '',
                     key: 'rowIndex',
@@ -66,34 +66,23 @@
                     ellipsis: true,
                 },
                 {
-                    title: '存货编码',
+                    title: '料品编码',
                     align:"center",
                     dataIndex: 'inventoryCode',
                     ellipsis: true,
                 },
                 {
-                    title: '存货名称',
+                    title: '料品名称',
                     align:"center",
                     dataIndex: 'inventoryName',
                     ellipsis: true,
                 },
                 {
-                    title: '已执行主数量',
-                    align:"center",
-                    dataIndex: 'quantityExecute',
-                    ellipsis: true,
-                },
-                {
-                    title: '已执行辅数量',
-                    align:"center",
-                    dataIndex: 'unQuantityExecute',
-                    ellipsis: true,
-                },
-                {
-                    title: '辅数量',
+                    title: '计量单位',
                     align:"center",
-                    dataIndex: 'unQuantity',
+                    dataIndex: 'unit',
                     ellipsis: true,
+
                 },
                 {
                     title: '辅计量单位',
@@ -101,12 +90,6 @@
                     dataIndex: 'auxiliaryUnit',
                     ellipsis: true,
                 },
-                {
-                    title: '换算率',
-                    align:"center",
-                    dataIndex: 'rate',
-                    ellipsis: true,
-                },
                 {
                     title: '主数量',
                     align:"center",
@@ -114,9 +97,9 @@
                     ellipsis: true,
                 },
                 {
-                    title: '计量单位',
+                    title: '辅数量',
                     align:"center",
-                    dataIndex: 'unit',
+                    dataIndex: 'unQuantity',
                     ellipsis: true,
                 },
                 {
@@ -125,7 +108,6 @@
                     dataIndex: 'specs',
                     ellipsis: true,
                 },
-                
                 {
                     title: '型号',
                     align:"center",
@@ -138,6 +120,12 @@
                     dataIndex: 'color',
                     ellipsis: true,
                 },
+                {   
+                    title: '支数',
+                    align:"center",
+                    dataIndex: 'fixedNum',
+                    ellipsis: true,
+                },
                 {   
                     title: '定尺',
                     align:"center",
@@ -145,15 +133,27 @@
                     ellipsis: true,
                 },
                 {
-                    title: '合金',
+                    title: '宽/高',
                     align:"center",
-                    dataIndex: 'alloy',
+                    dataIndex: 'widthHeight',
                     ellipsis: true,
                 },
                 {   
-                    title: '标准',
+                    title: '片数',
+                    align:"center",
+                    dataIndex: 'pieces',
+                    ellipsis: true,
+                },
+                {
+                    title: '备注',
+                    align:"center",
+                    dataIndex: 'remarks',
+                    ellipsis: true,
+                },
+                {
+                    title: '换算率',
                     align:"center",
-                    dataIndex: 'standard',
+                    dataIndex: 'rate',
                     ellipsis: true,
                 },
                 {
@@ -181,9 +181,9 @@
                     ellipsis: true,
                 },
                 {
-                    title: '宽度',
+                    title: '宽度/长度',
                     align:"center",
-                    dataIndex: 'width',
+                    dataIndex: 'widthLength',
                     ellipsis: true,
                 },
                 {
@@ -192,12 +192,6 @@
                     dataIndex: 'height',
                     ellipsis: true,
                 },
-                {
-                    title: '时间戳',
-                    align:"center",
-                    dataIndex: 'timeStamp',
-                    ellipsis: true,
-                },
                 {
                     title: '楼层楼号',
                     align:"center",
@@ -233,7 +227,7 @@
                     title: '面积',
                     align:"center",
                     dataIndex: 'area',
-                    ellipsis: true, 
+                    ellipsis: true,
                 },
                 {
                     title: '切割长度',
@@ -253,12 +247,7 @@
                     dataIndex: 'cuttingRightTop',
                     ellipsis: true,
                 },
-                {
-                    title: '备注',
-                    align:"center",
-                    dataIndex: 'remarks',
-                    ellipsis: true,
-                },
+                
                 {
                     title: '系列',
                     align:"center",

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

@@ -0,0 +1,351 @@
+<template>
+    <div >
+        <a-form-model ref="formRef">
+            <a-table
+            ref="table"
+            size="middle"
+            bordered
+            id='sonList'
+            :columns="columns"
+            rowKey="rowNo"
+            :dataSource="dataSource"
+            :pagination="false"
+            :scroll="{ x: 5500, y: 300 }"
+            :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+            @change="handleTableChange"
+            >
+            </a-table>
+        </a-form-model>
+    </div>
+  </template>
+  
+  <script>
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import JEllipsis from '@/components/jeecg/JEllipsis'
+  import moment from 'moment'
+  export default {
+    name: 'TemporaryStorage', //  Tabs 详情
+    mixins: [JeecgListMixin],
+    components: {
+      JEllipsis,
+      moment,
+    },
+    data() {
+      return {
+        selectedRowKeys:[],
+        selectedRows:[],
+        dataSource:[],
+        columns: [
+                {
+                    title: '#',
+                    dataIndex: '',
+                    key: 'rowIndex',
+                    width: 60,
+                    align: "center",
+                    customRender:function (t, r, index) {
+                        return parseInt(index)+1;
+                    }
+                },
+                {
+                    title: '项目编码',
+                    align:"center",
+                    dataIndex: 'projectCode',
+                    ellipsis: true,
+                },
+                {
+                    title: '项目名称',
+                    align:"center",
+                    dataIndex: 'projectName',
+                    ellipsis: true,
+                },
+                {
+                    title: '批次',
+                    align:"center",
+                    dataIndex: 'batch',
+                    ellipsis: true,
+                    scopedSlots: { customRender: 'batch' } 
+                },
+                {
+                    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: 'framesCount',
+                    ellipsis: true,
+                 },
+                 {
+                    title: '扇统计',
+                    align:"center",
+                    dataIndex: 'leafCount',
+                    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,
+                },
+          ],
+      }
+    },
+     props: {
+      
+    },
+  
+    created() {},
+    methods: {
+        onSelectChange(selectedRowKeys, selectionRows) {
+            this.selectedRowKeys = selectedRowKeys;
+            this.selectedRows = selectionRows;
+        },
+        addList(){
+            this.dataSource.unshift({rowNo: this.dataSource.length+1})
+        },
+        delectRow(){
+            if( this.selectedRowKeys.length==0){
+                this.$message.warning('请勾选子表数据！')
+            }else{
+                this.selectedRowKeys.map(event=>{
+                    this.dataSource =  this.dataSource.filter( (x)=> {return x.rowNo !== event});
+                })
+            }
+        },
+        changeOutColor(){
+            this.$emit('changeOutColor')
+        }
+    },
+  
+    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;
+    }
+  </style>
+  

src/views/production/productionTotalOrder/modules/OutboundDetail.vue → src/views/production/productionTotalOrder/modules/TemporaryStorageDetail.vue

@@ -25,7 +25,7 @@
   import JEllipsis from '@/components/jeecg/JEllipsis'
   import moment from 'moment'
   export default {
-    name: 'OutboundDetail', //  Tabs 详情
+    name: 'TemporaryStorageDetail', //  Tabs 详情
     mixins: [JeecgListMixin],
     components: {
       JEllipsis,
@@ -37,7 +37,7 @@
         selectedRows:[],
         dataSource:[],
         columns: [
-                {
+        {
                     title: '#',
                     dataIndex: '',
                     key: 'rowIndex',
@@ -64,59 +64,60 @@
                     align:"center",
                     dataIndex: 'batch',
                     ellipsis: true,
+                    scopedSlots: { customRender: 'batch' } 
                 },
                 {
-                    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: 'rate',
+                    dataIndex: 'quantity',
                     ellipsis: true,
                 },
                 {
-                    title: '辅计量单位',
+                    title: '成品辅数量',
                     align:"center",
-                    dataIndex: 'auxiliaryUnit',
+                    dataIndex: 'unQuantity',
                     ellipsis: true,
                 },
                 {
-                    title: '辅数量',
+                    title: '框统计',
                     align:"center",
-                    dataIndex: 'unQuantity',
+                    dataIndex: 'framesCount',
                     ellipsis: true,
-                },
-                {
-                    title: '已执行主数量',
+                 },
+                 {
+                    title: '扇统计',
                     align:"center",
-                    dataIndex: 'quantityExecute',
+                    dataIndex: 'leafCount',
                     ellipsis: true,
                 },
                 {
-                    title: '已执行辅数量',
+                    title: '规格',
                     align:"center",
-                    dataIndex: 'unQuantityExecute',
+                    dataIndex: 'specs',
                     ellipsis: true,
                 },
                 {
@@ -131,6 +132,12 @@
                     dataIndex: 'color',
                     ellipsis: true,
                 },
+                {
+                    title: '支数',
+                    align:"center",
+                    dataIndex: 'fixedNum',
+                    ellipsis: true,
+                },
                 {   
                     title: '定尺',
                     align:"center",
@@ -138,15 +145,21 @@
                     ellipsis: true,
                 },
                 {
-                    title: '合金',
+                    title: '宽/高',
                     align:"center",
-                    dataIndex: 'alloy',
+                    dataIndex: 'widthHeight',
                     ellipsis: true,
                 },
-                {   
-                    title: '标准',
+                {
+                    title: '片数',
+                    align:"center",
+                    dataIndex: 'pieces',
+                    ellipsis: true,
+                },
+                {
+                    title: '备注',
                     align:"center",
-                    dataIndex: 'standard',
+                    dataIndex: 'remarks',
                     ellipsis: true,
                 },
                 {
@@ -174,9 +187,9 @@
                     ellipsis: true,
                 },
                 {
-                    title: '宽度',
+                    title: '宽度/长度',
                     align:"center",
-                    dataIndex: 'width',
+                    dataIndex: 'widthLength',
                     ellipsis: true,
                 },
                 {
@@ -197,13 +210,6 @@
                     dataIndex: 'framesTang',
                     ellipsis: true,
                 },
-                
-                {
-                    title: '框统计',
-                    align:"center",
-                    dataIndex: 'framesCount',
-                    ellipsis: true,
-                 },
                 {
                     title: '半成品分类',
                     align:"center",
@@ -240,6 +246,12 @@
                     dataIndex: 'series',
                     ellipsis: true,
                 },
+                {
+                    title: '玻璃编号',
+                    align:"center",
+                    dataIndex: 'glassNumber',
+                    ellipsis: true,
+                },
           ],
       }
     },

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

@@ -1,592 +0,0 @@
-<template>
-    <div >
-        <a-form-model ref="formRef">
-            <a-table
-            ref="table"
-            size="middle"
-            bordered
-            id='sonList'
-            :columns="columns"
-            rowKey="rowNo"
-            :dataSource="dataSource"
-            :pagination="false"
-            :scroll="{ x: 5500, y: 300 }"
-            :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
-            @change="handleTableChange"
-            >
-                <template slot="projectCode" slot-scope="text, record, index">
-                    <a-form-model-item prop="projectCode" class='sonItem'>
-                        <a-input placeholder="请输入" v-model="record.projectCode" disabled></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></a-input>
-                    </a-form-model-item>
-                </template>
-                <template slot="batch" slot-scope="text, record, index">
-                    <a-form-model-item prop="batch" class='sonItem'>
-                        <a-input placeholder="请输入" v-model="record.batch" disabled></a-input>
-                    </a-form-model-item>
-                </template> 
-                <template slot="inventoryCode" slot-scope="text, record, index">
-                    <a-form-model-item prop="inventoryCode" class='sonItem'>
-                        <a-input placeholder="请输入" v-model="record.inventoryCode" disabled></a-input>
-                    </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></a-input>
-                    </a-form-model-item>
-                </template>
-                <template slot="quantityExecute" slot-scope="text, record, index">
-                    <a-form-model-item prop="quantityExecute" class='sonItem'>
-                        <a-input placeholder="请输入" v-model="record.quantityExecute" disabled> </a-input>
-                     </a-form-model-item>
-                </template>
-                <template slot="unQuantityExecute" slot-scope="text, record, index">
-                    <a-form-model-item prop="unQuantityExecute" class='sonItem'>
-                        <a-input placeholder="请输入" v-model="record.unQuantityExecute" disabled></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></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.unauxiliaryUnitQuantity" disabled></a-input>
-                     </a-form-model-item>
-                </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></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></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></a-input>
-                     </a-form-model-item>
-                </template>
-                <template slot="model" slot-scope="text, record, index">
-                    <a-form-model-item prop="model" class='sonItem'>
-                        <a-input placeholder="请输入" v-model="record.model" disabled></a-input>
-                     </a-form-model-item>
-                </template>
-                <template slot="color" slot-scope="text, record, index">
-                    <a-form-model-item prop="color" class='sonItem'>
-                        <a-input placeholder="请输入" v-model="record.color" :disabled ="allowEditColor=='no'" @change='changeWareColor'></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></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></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></a-input>
-                     </a-form-model-item>
-                </template>
-                <template slot="meterWeight" slot-scope="text, record, index">
-                    <a-form-model-item prop="meterWeight" class='sonItem'>
-                        <a-input placeholder="请输入" v-model="record.meterWeight" disabled></a-input>
-                     </a-form-model-item>
-                </template>
-                <template slot="decorationLength" slot-scope="text, record, index">
-                    <a-form-model-item prop="decorationLength" class='sonItem'>
-                        <a-input placeholder="请输入" v-model="record.decorationLength" disabled></a-input>
-                     </a-form-model-item>
-                </template>
-                <template slot="windowNo" slot-scope="text, record, index">
-                    <a-form-model-item prop="windowNo" class='sonItem'>
-                        <a-input placeholder="请输入" v-model="record.windowNo" disabled></a-input>
-                     </a-form-model-item>
-                </template>
-                <template slot="exclusiveZone" slot-scope="text, record, index">
-                    <a-form-model-item prop="exclusiveZone" class='sonItem'>
-                        <a-input placeholder="请输入" v-model="record.exclusiveZone" disabled></a-input>
-                     </a-form-model-item>
-                </template>
-                <template slot="width" slot-scope="text, record, index">
-                    <a-form-model-item prop="width" class='sonItem'>
-                        <a-input placeholder="请输入" v-model="record.width" disabled></a-input>
-                     </a-form-model-item>
-                </template>
-                <template slot="height" slot-scope="text, record, index">
-                    <a-form-model-item prop="height" class='sonItem'>
-                        <a-input placeholder="请输入" v-model="record.height" disabled></a-input>
-                     </a-form-model-item>
-                </template>
-                <template slot="timeStamp" slot-scope="text, record, index">
-                    <a-form-model-item prop="timeStamp" class='sonItem'>
-                        <a-input placeholder="请输入" v-model="record.timeStamp" disabled></a-input>
-                     </a-form-model-item>
-                </template>
-                <template slot="buildingNumber" slot-scope="text, record, index">
-                    <a-form-model-item prop="buildingNumber" class='sonItem'>
-                        <a-input placeholder="请输入" v-model="record.buildingNumber" disabled></a-input>
-                     </a-form-model-item>
-                </template>
-                <template slot="framesTang" slot-scope="text, record, index">
-                    <a-form-model-item prop="framesTang" class='sonItem'>
-                        <a-input placeholder="请输入" v-model="record.framesTang" disabled></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></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></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></a-input>
-                     </a-form-model-item>
-                </template>
-                <template slot="area" slot-scope="text, record, index">
-                    <a-form-model-item prop="area" class='sonItem'>
-                        <a-input placeholder="请输入" v-model="record.area" disabled></a-input>
-                     </a-form-model-item>
-                </template>
-                <template slot="cuttingLength" slot-scope="text, record, index">
-                    <a-form-model-item prop="cuttingLength" class='sonItem'>
-                        <a-input placeholder="请输入" v-model="record.cuttingLength" disabled></a-input>
-                     </a-form-model-item>
-                </template>
-                <template slot="cuttingLeftDown" slot-scope="text, record, index">
-                    <a-form-model-item prop="cuttingLeftDown" class='sonItem'>
-                        <a-input placeholder="请输入" v-model="record.cuttingLeftDown" disabled></a-input>
-                     </a-form-model-item>
-                </template>
-                <template slot="cuttingRightTop" slot-scope="text, record, index">
-                    <a-form-model-item prop="cuttingRightTop" class='sonItem'>
-                        <a-input placeholder="请输入" v-model="record.cuttingRightTop" disabled></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></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></a-input>
-                     </a-form-model-item>
-                </template>
-                <template slot="glassNumber" slot-scope="text, record, index">
-                    <a-form-model-item prop="glassNumber" class='sonItem'>
-                        <a-input placeholder="请输入" v-model="record.glassNumber" disabled></a-input>
-                     </a-form-model-item>
-                </template>
-            </a-table>
-        </a-form-model>
-    </div>
-  </template>
-  
-  <script>
-  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-  import JEllipsis from '@/components/jeecg/JEllipsis'
-  import moment from 'moment'
-  export default {
-    name: 'Warehousing', //  Tabs 详情
-    mixins: [JeecgListMixin],
-    components: {
-      JEllipsis,
-      moment,
-    },
-    data() {
-      return {
-        selectedRowKeys:[],
-        selectedRows:[],
-        dataSource:[],
-        allowEditColor:'no',
-        columns: [
-                {
-                    title: '#',
-                    dataIndex: '',
-                    key: 'rowIndex',
-                    width: 60,
-                    align: "center",
-                    customRender:function (t, r, index) {
-                        return parseInt(index)+1;
-                    }
-                },
-                {
-                    title: '项目编码',
-                    align:"center",
-                    dataIndex: 'projectCode',
-                    ellipsis: true,
-                    scopedSlots: { customRender: 'projectCode' } 
-                },
-                {
-                    title: '项目名称',
-                    align:"center",
-                    dataIndex: 'projectName',
-                    ellipsis: true,
-                    scopedSlots: { customRender: 'projectName' } 
-                },
-                {
-                    title: '批次',
-                    align:"center",
-                    dataIndex: 'batch',
-                    ellipsis: true,
-                    scopedSlots: { customRender: 'batch' } 
-                },
-                {
-                    title: '存货编码',
-                    align:"center",
-                    dataIndex: 'inventoryCode',
-                    ellipsis: true,
-                    scopedSlots: { customRender: 'inventoryCode' } 
-
-                },
-                {
-                    title: '存货名称',
-                    align:"center",
-                    dataIndex: 'inventoryName',
-                    ellipsis: true,
-                    scopedSlots: { customRender: 'inventoryName' } 
-
-                },
-                {
-                    title: '已执行主数量',
-                    align:"center",
-                    dataIndex: 'quantityExecute',
-                    ellipsis: true,
-                    scopedSlots: { customRender: 'quantityExecute' } 
-                },
-                {
-                    title: '已执行辅数量',
-                    align:"center",
-                    dataIndex: 'unQuantityExecute',
-                    ellipsis: true,
-                    scopedSlots: { customRender: 'unQuantityExecute' } 
-                },
-                {
-                    title: '辅数量',
-                    align:"center",
-                    dataIndex: 'unQuantity',
-                    ellipsis: true,
-                    scopedSlots: { customRender: 'unQuantity' } 
-                },
-                {
-                    title: '辅计量单位',
-                    align:"center",
-                    dataIndex: 'auxiliaryUnit',
-                    ellipsis: true,
-                    scopedSlots: { customRender: 'auxiliaryUnit' } 
-                },
-                {
-                    title: '换算率',
-                    align:"center",
-                    dataIndex: 'rate',
-                    ellipsis: true,
-                },
-                {
-                    title: '主数量',
-                    align:"center",
-                    dataIndex: 'quantity',
-                    ellipsis: true,
-                    scopedSlots: { customRender: 'quantity' } 
-
-                },
-                {
-                    title: '计量单位',
-                    align:"center",
-                    dataIndex: 'unit',
-                    ellipsis: true,
-                    scopedSlots: { customRender: 'unit' } 
-
-                },
-                {
-                    title: '规格',
-                    align:"center",
-                    dataIndex: 'specs',
-                    ellipsis: true,
-                    scopedSlots: { customRender: 'specs' } 
-                },
-                
-                {
-                    title: '型号',
-                    align:"center",
-                    dataIndex: 'model',
-                    ellipsis: true,
-                    scopedSlots: { customRender: 'model' } 
-                },
-                {
-                    title: '颜色',
-                    align:"center",
-                    dataIndex: 'color',
-                    ellipsis: true,
-                    scopedSlots: { customRender: 'color' } 
-
-                },
-                {   
-                    title: '定尺',
-                    align:"center",
-                    dataIndex: 'fixedLength',
-                    ellipsis: true,
-                    scopedSlots: { customRender: 'fixedLength' } 
-                },
-                {
-                    title: '合金',
-                    align:"center",
-                    dataIndex: 'alloy',
-                    ellipsis: true,
-                    scopedSlots: { customRender: 'alloy' } 
-                },
-                {   
-                    title: '标准',
-                    align:"center",
-                    dataIndex: 'standard',
-                    ellipsis: true,
-                    scopedSlots: { customRender: 'standard' } 
-                },
-                {
-                    title: '米重',
-                    align:"center",
-                    dataIndex: 'meterWeight',
-                    ellipsis: true,
-                    scopedSlots: { customRender: 'meterWeight' } 
-                },
-                {
-                    title: '装饰面周长',
-                    align:"center",
-                    dataIndex: 'decorationLength',
-                    ellipsis: true,
-                    scopedSlots: { customRender: 'decorationLength' } 
-                },
-                {
-                    title: '窗号',
-                    align:"center",
-                    dataIndex: 'windowNo',
-                    ellipsis: true,
-                    scopedSlots: { customRender: 'windowNo' } 
-                },
-                {
-                    title: '专用区',
-                    align:"center",
-                    dataIndex: 'exclusiveZone',
-                    ellipsis: true,
-                    scopedSlots: { customRender: 'exclusiveZone' } 
-                },
-                {
-                    title: '宽度',
-                    align:"center",
-                    dataIndex: 'width',
-                    ellipsis: true,
-                    scopedSlots: { customRender: 'width' } 
-                },
-                {
-                    title: '高度',
-                    align:"center",
-                    dataIndex: 'height',
-                    ellipsis: true,
-                    scopedSlots: { customRender: 'height' } 
-                },
-                {
-                    title: '时间戳',
-                    align:"center",
-                    dataIndex: 'timeStamp',
-                    ellipsis: true,
-                    scopedSlots: { customRender: 'timeStamp' } 
-                },
-                {
-                    title: '楼层楼号',
-                    align:"center",
-                    dataIndex: 'buildingNumber',
-                    ellipsis: true,
-                    scopedSlots: { customRender: 'buildingNumber' } 
-                },
-                {
-                    title: '樘数(数量)',
-                    align:"center",
-                    dataIndex: 'framesTang',
-                    ellipsis: true,
-                    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",
-                    dataIndex: 'semiClass',
-                    ellipsis: true,
-                    scopedSlots: { customRender: 'semiClass' } 
-                },
-                {
-                    title: '面积',
-                    align:"center",
-                    dataIndex: 'area',
-                    ellipsis: true,
-                    scopedSlots: { customRender: 'area' } 
-                },
-                {
-                    title: '切割长度',
-                    align:"center",
-                    dataIndex: 'cuttingLength',
-                    ellipsis: true,
-                    scopedSlots: { customRender: 'cuttingLength' } 
-                },
-                {
-                    title: '切割角度左下',
-                    align:"center",
-                    dataIndex: 'cuttingLeftDown',
-                    ellipsis: true,
-                    scopedSlots: { customRender: 'cuttingLeftDown' } 
-                },
-                {
-                    title: '切割角度右上',
-                    align:"center",
-                    dataIndex: 'cuttingRightTop',
-                    ellipsis: true,
-                    scopedSlots: { customRender: 'cuttingRightTop' } 
-                },
-                {
-                    title: '备注',
-                    align:"center",
-                    dataIndex: 'remarks',
-                    ellipsis: true,
-                    scopedSlots: { customRender: 'remarks' } 
-                },
-                {
-                    title: '系列',
-                    align:"center",
-                    dataIndex: 'series',
-                    ellipsis: true,
-                    scopedSlots: { customRender: 'series' } 
-                },
-                {
-                    title: '玻璃编号',
-                    align:"center",
-                    dataIndex: 'glassNumber',
-                    ellipsis: true,
-                    scopedSlots: { customRender: 'glassNumber' } 
-                },
-          ],
-      }
-    },
-     props: {
-      
-    },
-  
-    created() {},
-    methods: {
-        onSelectChange(selectedRowKeys, selectionRows) {
-            this.selectedRowKeys = selectedRowKeys;
-            this.selectedRows = selectionRows;
-        },
-        addList(){
-            this.dataSource.unshift({rowNo: this.dataSource.length+1})
-        },
-        delectRow(){
-            if( this.selectedRowKeys.length==0){
-                this.$message.warning('请勾选子表数据！')
-            }else{
-                this.selectedRowKeys.map(event=>{
-                    this.dataSource =  this.dataSource.filter( (x)=> {return x.rowNo !== event});
-                })
-            }
-        },
-        changeWareColor(){
-            this.$emit('changeWareColor')
-        }
-    },
-  
-    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;
-    }
-  </style>
-  

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

@@ -14,27 +14,9 @@
             :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
             @change="handleTableChange"
             >
-                <template slot="outsourcing" slot-scope="text, record, index">
-                    <a-form-model-item prop="outsourcing" class='sonItem'>
-                        <a-select v-model="record.outsourcing"  style='width:100%' @change="changeOut" :disabled="allowEdit=='no'&&allowEditMaterial=='no'&&!record.newRow" >
-                            <a-select-option value='是'> 是</a-select-option>
-                            <a-select-option value='否'> 否</a-select-option>
-                        </a-select>
-                    </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'&&!record.newRow"></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'&&!record.newRow"></a-input>
-                    </a-form-model-item>
-                </template>
                 <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'&&!record.newRow"></a-input>
+                        <a-input placeholder="请输入" v-model="record.batch" ></a-input>
                     </a-form-model-item>
                 </template> 
                 <template slot="inventoryCode" slot-scope="text, record, index">
@@ -42,169 +24,135 @@
                         <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'&&!record.newRow"></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'&&!record.newRow"></a-input>
-                     </a-form-model-item>
-                </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'&&!record.newRow&&!record.copied" @blur="changeQuantity(record)"></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'&&!record.newRow"></a-input>
+                        <a-input placeholder="请输入" v-model="record.quantity"  @blur="changeQuantity(record)"></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'&&!record.newRow&&!record.copied" @blur="changeUQuantity(record)"></a-input>
-                     </a-form-model-item>
-                </template>
-                <!-- <template slot="unQuantityExecute" slot-scope="text, record, index">
-                    <a-form-model-item prop="unQuantityExecute" class='sonItem'>
-                        <a-input placeholder="请输入" v-model="record.unQuantityExecute"></a-input>
-                     </a-form-model-item>
-                </template>
-                <template slot="quantityExecute" slot-scope="text, record, index">
-                    <a-form-model-item prop="quantityExecute" class='sonItem'>
-                        <a-input placeholder="请输入" v-model="record.quantityExecute"></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'&&!record.newRow"></a-input>
+                        <a-input placeholder="请输入" v-model="record.unQuantity"  @blur="changeUQuantity(record)"></a-input>
                      </a-form-model-item>
                 </template>
                 <template slot="model" slot-scope="text, record, index">
                     <a-form-model-item prop="model" class='sonItem'>
-                        <a-input placeholder="请输入" v-model="record.model" :disabled="allowEdit=='no'&&!record.newRow"></a-input>
+                        <a-input placeholder="请输入" v-model="record.model" ></a-input>
                      </a-form-model-item>
                 </template>
                 <template slot="color" slot-scope="text, record, index">
                     <a-form-model-item prop="color" class='sonItem'>
-                        <a-input placeholder="请输入" v-model="record.color" :disabled="allowEdit=='no'&&!record.newRow"></a-input>
+                        <a-input placeholder="请输入" v-model="record.color"></a-input>
                      </a-form-model-item>
                 </template>
-                <template slot="colorStorage" slot-scope="text, record, index">
-                    <a-form-model-item prop="colorStorage" class='sonItem'>
-                        <a-input placeholder="请输入" v-model="record.colorStorage" :disabled="allowEdit=='no'&&!record.newRow"></a-input>
+                <template slot="fixedNum" slot-scope="text, record, index">
+                    <a-form-model-item prop="fixedNum" class='sonItem'>
+                        <a-input placeholder="请输入" v-model="record.fixedNum"></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'&&!record.newRow"></a-input>
+                        <a-input placeholder="请输入" v-model="record.fixedLength" ></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'&&!record.newRow"></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" ></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'&&!record.newRow"></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"></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" ></a-input>
                      </a-form-model-item>
                 </template>
                 <template slot="meterWeight" slot-scope="text, record, index">
                     <a-form-model-item prop="meterWeight" class='sonItem'>
-                        <a-input placeholder="请输入" v-model="record.meterWeight" :disabled="allowEdit=='no'&&!record.newRow"></a-input>
+                        <a-input placeholder="请输入" v-model="record.meterWeight" ></a-input>
                      </a-form-model-item>
                 </template>
                 <template slot="decorationLength" slot-scope="text, record, index">
                     <a-form-model-item prop="decorationLength" class='sonItem'>
-                        <a-input placeholder="请输入" v-model="record.decorationLength" :disabled="allowEdit=='no'&&!record.newRow"></a-input>
+                        <a-input placeholder="请输入" v-model="record.decorationLength" ></a-input>
                      </a-form-model-item>
                 </template>
                 <template slot="windowNo" slot-scope="text, record, index">
                     <a-form-model-item prop="windowNo" class='sonItem'>
-                        <a-input placeholder="请输入" v-model="record.windowNo" :disabled="allowEdit=='no'&&!record.newRow"></a-input>
+                        <a-input placeholder="请输入" v-model="record.windowNo" ></a-input>
                      </a-form-model-item>
                 </template>
                 <template slot="exclusiveZone" slot-scope="text, record, index">
                     <a-form-model-item prop="exclusiveZone" class='sonItem'>
-                        <a-input placeholder="请输入" v-model="record.exclusiveZone" :disabled="allowEdit=='no'&&!record.newRow"></a-input>
+                        <a-input placeholder="请输入" v-model="record.exclusiveZone" ></a-input>
                      </a-form-model-item>
                 </template>
-                <template slot="width" slot-scope="text, record, index">
-                    <a-form-model-item prop="width" class='sonItem'>
-                        <a-input placeholder="请输入" v-model="record.width" :disabled="allowEdit=='no'&&!record.newRow"></a-input>
+                <template slot="widthLength" slot-scope="text, record, index">
+                    <a-form-model-item prop="widthLength" class='sonItem'>
+                        <a-input placeholder="请输入" v-model="record.widthLength" ></a-input>
                      </a-form-model-item>
                 </template>
                 <template slot="height" slot-scope="text, record, index">
                     <a-form-model-item prop="height" class='sonItem'>
-                        <a-input placeholder="请输入" v-model="record.height" :disabled="allowEdit=='no'&&!record.newRow"></a-input>
+                        <a-input placeholder="请输入" v-model="record.height" ></a-input>
                      </a-form-model-item>
                 </template>
                 <template slot="buildingNumber" slot-scope="text, record, index">
                     <a-form-model-item prop="buildingNumber" class='sonItem'>
-                        <a-input placeholder="请输入" v-model="record.buildingNumber" :disabled="allowEdit=='no'&&!record.newRow"></a-input>
+                        <a-input placeholder="请输入" v-model="record.buildingNumber"></a-input>
                      </a-form-model-item>
                 </template>
                 <template slot="framesTang" slot-scope="text, record, index">
                     <a-form-model-item prop="framesTang" class='sonItem'>
-                        <a-input placeholder="请输入" v-model="record.framesTang" :disabled="allowEdit=='no'&&!record.newRow"></a-input>
+                        <a-input placeholder="请输入" v-model="record.framesTang" ></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'&&!record.newRow"></a-input>
+                        <a-input placeholder="请输入" v-model="record.framesCount" ></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'&&!record.newRow"></a-input>
+                        <a-input placeholder="请输入" v-model="record.leafCount" ></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'&&!record.newRow"></a-input>
+                        <a-input placeholder="请输入" v-model="record.semiClass" ></a-input>
                      </a-form-model-item>
                 </template>
                 <template slot="area" slot-scope="text, record, index">
                     <a-form-model-item prop="area" class='sonItem'>
-                        <a-input placeholder="请输入" v-model="record.area" :disabled="allowEdit=='no'&&!record.newRow"></a-input>
+                        <a-input placeholder="请输入" v-model="record.area" ></a-input>
                      </a-form-model-item>
                 </template>
                 <template slot="cuttingLength" slot-scope="text, record, index">
                     <a-form-model-item prop="cuttingLength" class='sonItem'>
-                        <a-input placeholder="请输入" v-model="record.cuttingLength" :disabled="allowEdit=='no'&&!record.newRow"></a-input>
+                        <a-input placeholder="请输入" v-model="record.cuttingLength" ></a-input>
                      </a-form-model-item>
                 </template>
                 <template slot="cuttingLeftDown" slot-scope="text, record, index">
                     <a-form-model-item prop="cuttingLeftDown" class='sonItem'>
-                        <a-input placeholder="请输入" v-model="record.cuttingLeftDown" :disabled="allowEdit=='no'&&!record.newRow"></a-input>
+                        <a-input placeholder="请输入" v-model="record.cuttingLeftDown"></a-input>
                      </a-form-model-item>
                 </template>
                 <template slot="cuttingRightTop" slot-scope="text, record, index">
                     <a-form-model-item prop="cuttingRightTop" class='sonItem'>
-                        <a-input placeholder="请输入" v-model="record.cuttingRightTop" :disabled="allowEdit=='no'&&!record.newRow"></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'&&!record.newRow"></a-input>
+                        <a-input placeholder="请输入" v-model="record.cuttingRightTop" ></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'&&!record.newRow"></a-input>
+                        <a-input placeholder="请输入" v-model="record.series" ></a-input>
                      </a-form-model-item>
                 </template>
                 <template slot="glassNumber" slot-scope="text, record, index">
                     <a-form-model-item prop="glassNumber" class='sonItem'>
-                        <a-input placeholder="请输入" v-model="record.glassNumber" :disabled="allowEdit=='no'&&!record.newRow"></a-input>
-                     </a-form-model-item>
-                </template>
-                <template slot="storageLocation" slot-scope="text, record, index">
-                    <a-form-model-item prop="storageLocation" class='sonItem'>
-                        <a-input placeholder="请输入" v-model="record.storageLocation" :disabled="allowEdit=='no'&&!record.newRow"></a-input>
+                        <a-input placeholder="请输入" v-model="record.glassNumber"></a-input>
                      </a-form-model-item>
                 </template>
             </a-table>
@@ -231,8 +179,7 @@
         selectedRowKeys:[],
         selectedRows:[],
         dataSource:[],
-        allowEdit:'yes',
-        allowEditMaterial:'no',
+        planOrg:'',
         columns: [
                 {
                     title: '#',
@@ -244,26 +191,17 @@
                         return parseInt(index)+1;
                     }
                 },
-                {
-                    title: '是否委外',
-                    align:"center",
-                    dataIndex: 'outsourcing',
-                    ellipsis: true,
-                    scopedSlots: { customRender: 'outsourcing' } 
-                },
                 {
                     title: '项目编码',
                     align:"center",
                     dataIndex: 'projectCode',
                     ellipsis: true,
-                    // scopedSlots: { customRender: 'projectCode' } 
                 },
                 {
                     title: '项目名称',
                     align:"center",
                     dataIndex: 'projectName',
                     ellipsis: true,
-                    // scopedSlots: { customRender: 'projectName' } 
                 },
                 {
                     title: '批次',
@@ -273,7 +211,7 @@
                     scopedSlots: { customRender: 'batch' } 
                 },
                 {
-                    title: '存货编码',
+                    title: '料品编码',
                     align:"center",
                     dataIndex: 'inventoryCode',
                     ellipsis: true,
@@ -281,35 +219,36 @@
 
                 },
                 {
-                    title: '存货名称',
+                    title: '料品名称',
                     align:"center",
                     dataIndex: 'inventoryName',
                     ellipsis: true,
-                    // scopedSlots: { customRender: 'inventoryName' } 
-
                 },
                 {
-                    title: '计量单位',
+                    title: '料品属性',
                     align:"center",
-                    dataIndex: 'unit',
+                    dataIndex: 'attribute',
                     ellipsis: true,
-                    // scopedSlots: { customRender: 'unit' } 
-
                 },
                 {
-                    title: '主数量',
+                    title: '计量单位',
                     align:"center",
-                    dataIndex: 'quantity',
+                    dataIndex: 'unit',
                     ellipsis: true,
-                    scopedSlots: { customRender: 'quantity' } 
-
                 },
                 {
                     title: '辅计量单位',
                     align:"center",
                     dataIndex: 'auxiliaryUnit',
                     ellipsis: true,
-                    // scopedSlots: { customRender: 'auxiliaryUnit' } 
+                },
+                {
+                    title: '主数量',
+                    align:"center",
+                    dataIndex: 'quantity',
+                    ellipsis: true,
+                    scopedSlots: { customRender: 'quantity' } 
+
                 },
                 {
                     title: '辅数量',
@@ -355,11 +294,11 @@
 
                 },
                 {
-                    title: '入库颜色',
+                    title: '支数',
                     align:"center",
-                    dataIndex: 'colorStorage',
+                    dataIndex: 'fixedNum',
                     ellipsis: true,
-                    scopedSlots: { customRender: 'colorStorage' } 
+                    scopedSlots: { customRender: 'fixedNum' } 
 
                 },
                 {   
@@ -370,18 +309,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: '米重',
@@ -412,11 +358,11 @@
                     scopedSlots: { customRender: 'exclusiveZone' } 
                 },
                 {
-                    title: '宽度',
+                    title: '宽度/长度',
                     align:"center",
-                    dataIndex: 'width',
+                    dataIndex: 'widthLength',
                     ellipsis: true,
-                    scopedSlots: { customRender: 'width' } 
+                    scopedSlots: { customRender: 'widthLength' } 
                 },
                 {
                     title: '高度',
@@ -489,13 +435,7 @@
                     ellipsis: true,
                     scopedSlots: { customRender: 'cuttingRightTop' } 
                 },
-                {
-                    title: '备注',
-                    align:"center",
-                    dataIndex: 'remarks',
-                    ellipsis: true,
-                    scopedSlots: { customRender: 'remarks' } 
-                },
+                
                 {
                     title: '系列',
                     align:"center",
@@ -510,19 +450,6 @@
                     ellipsis: true,
                     scopedSlots: { customRender: 'glassNumber' } 
                 },
-                {
-                    title: '换算率',
-                    align:"center",
-                    dataIndex: 'rate',
-                    ellipsis: true,
-                },
-                {
-                    title: '货位',
-                    align:"center",
-                    dataIndex: 'storageLocation',
-                    ellipsis: true,
-                    scopedSlots: { customRender: 'storageLocation' } 
-                },
           ],
       }
     },
@@ -548,74 +475,27 @@
                 })
             }
         },
-        delecteCopyRow(){
-            if( this.selectedRowKeys.length==0){
-                this.$message.warning('请勾选子表数据！')
-            }else{
-               var delectAllow = 'yes'
-               this.selectedRows.map(item=>{
-                if(item.id){delectAllow = 'no'}
-               })
-               if(delectAllow=='no'){
-                this.$emit('clearn')
-                this.$message.warning('勾选数据中有不可删除数据！')
-               }else{
-                this.selectedRowKeys.map(event=>{
-                    this.dataSource =  this.dataSource.filter( (x)=> {return x.rowNo !== event});
-                })
-               }
-            }
-        },
-        copyRow(){
-            if(this.selectedRowKeys.length!==1){
-                this.$emit('clearn')
-                this.$message.warning('请勾选一条数据！')
-            }else{
-              var obj ={},
-              num = 0
-              this.dataSource.map((item,index)=>{
-                if(item.id== this.selectedRows[0].id){
-                    item.copied = '1'
-                    obj = {...item}
-                    obj.projectCode = '6'
-                    obj.newRow = '1'
-                    obj.id = ''
-                    num = index+1
-
-                } 
-              })
-              this.dataSource.splice(num, 0, obj);
-              this.dataSource.map((item,index )=>{item.rowNo = index})
-              this.selectedRows = []
-              this.selectedRowKeys=[]
-            }
-        },
-        changeOut(){   
-            if(this.allowEdit=='no'&&this.allowEditMaterial=='yes'){
-                this.$emit('changeEdit')
-            }
-        },
         addMaterial(){
             this.dataSource.push({newRow:'1'})
         },
         changeQuantity(record){
-            if(record.copied&&record.quantity&&record.quantityExecute&&(Number(record.quantity)<Number(record.quantityExecute))){
+            if(record.quantity&&record.quantityExecute&&(Number(record.quantity)<Number(record.quantityExecute))){
                 record.quantity = ''
                 this.$message.warning('主数量不可小于已执行主数量！')
             }
         },
         changeUQuantity(record){
-            if(record.copied&&record.unQuantity&&record.unQuantityExecute&&(Number(record.unQuantity)<Number(record.unQuantityExecute))){
+            if(rrecord.unQuantity&&record.unQuantityExecute&&(Number(record.unQuantity)<Number(record.unQuantityExecute))){
                 record.unQuantity = ''
                 this.$message.warning('辅数量不可小于已执行辅数量！')
             }
         },
         onSearchInven(record){
-            if(this.allowEdit=='no'&&!record.newRow){
-                this.$message.warning('不可编辑！')
+            if(!this.planOrg||this.planOrg==''){
+                this.$message.warning('请选择生产组织！')
             }else{
                 this.$refs.inventoryPopup.visible = true
-                this.$refs.inventoryPopup.getData()
+                this.$refs.inventoryPopup.getData(this.planOrg)
                 this.$refs.inventoryPopup.record=record
             }
         },
@@ -625,6 +505,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 )
         },
     },

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

@@ -35,7 +35,7 @@
         selectedRows:[],
         dataSource:[],
         columns: [
-                {
+        {
                     title: '#',
                     dataIndex: '',
                     key: 'rowIndex',
@@ -45,12 +45,6 @@
                         return parseInt(index)+1;
                     }
                 },
-                {
-                    title: '是否委外',
-                    align:"center",
-                    dataIndex: 'outsourcing',
-                    ellipsis: true,
-                },
                 {
                     title: '项目编码',
                     align:"center",
@@ -70,27 +64,27 @@
                     ellipsis: true,
                 },
                 {
-                    title: '存货编码',
+                    title: '料品编码',
                     align:"center",
                     dataIndex: 'inventoryCode',
                     ellipsis: true,
                 },
                 {
-                    title: '存货名称',
+                    title: '料品名称',
                     align:"center",
                     dataIndex: 'inventoryName',
                     ellipsis: true,
                 },
                 {
-                    title: '计量单位',
+                    title: '料品属性',
                     align:"center",
-                    dataIndex: 'unit',
+                    dataIndex: 'attribute',
                     ellipsis: true,
                 },
                 {
-                    title: '主数量',
+                    title: '计量单位',
                     align:"center",
-                    dataIndex: 'quantity',
+                    dataIndex: 'unit',
                     ellipsis: true,
                 },
                 {
@@ -99,6 +93,12 @@
                     dataIndex: 'auxiliaryUnit',
                     ellipsis: true,
                 },
+                {
+                    title: '主数量',
+                    align:"center",
+                    dataIndex: 'quantity',
+                    ellipsis: true
+                },
                 {
                     title: '辅数量',
                     align:"center",
@@ -134,14 +134,12 @@
                     align:"center",
                     dataIndex: 'color',
                     ellipsis: true,
-
                 },
                 {
-                    title: '入库颜色',
+                    title: '支数',
                     align:"center",
-                    dataIndex: 'colorStorage',
+                    dataIndex: 'fixedNum',
                     ellipsis: true,
-
                 },
                 {   
                     title: '定尺',
@@ -150,15 +148,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,
                 },
                 {
@@ -186,9 +190,9 @@
                     ellipsis: true,
                 },
                 {
-                    title: '宽度',
+                    title: '宽度/长度',
                     align:"center",
-                    dataIndex: 'width',
+                    dataIndex: 'widthLength',
                     ellipsis: true,
                 },
                 {
@@ -252,12 +256,7 @@
                     dataIndex: 'cuttingRightTop',
                     ellipsis: true,
                 },
-                {
-                    title: '备注',
-                    align:"center",
-                    dataIndex: 'remarks',
-                    ellipsis: true,
-                },
+                
                 {
                     title: '系列',
                     align:"center",
@@ -270,18 +269,6 @@
                     dataIndex: 'glassNumber',
                     ellipsis: true,
                 },
-                {
-                    title: '换算率',
-                    align:"center",
-                    dataIndex: 'rate',
-                    ellipsis: true,
-                },
-                {
-                    title: '货位',
-                    align:"center",
-                    dataIndex: 'storageLocation',
-                    ellipsis: true,
-                },
           ],
       }
     },

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

@@ -16,7 +16,7 @@
             >
                 <template slot="billingType" slot-scope="text, record, index">
                     <a-form-model-item prop="billingType" class='sonItem'>
-                        <a-select v-model="record.billingType"  style='width:100%'  :disabled="allowEdit=='no'">
+                        <a-select v-model="record.billingType"  style='width:100%'  >
                             <a-select-option value='铝合金门窗'> 铝合金门窗</a-select-option>
                             <a-select-option value='双开窗'> 双开窗</a-select-option>
                         </a-select>
@@ -24,7 +24,7 @@
                 </template>
                 <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-input placeholder="请输入" v-model="record.batch" ></a-input>
                     </a-form-model-item>
                 </template> 
                 <template slot="inventoryCode" slot-scope="text, record, index">
@@ -34,17 +34,17 @@
                 </template>
                 <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-input placeholder="请输入" v-model="record.batch" ></a-input>
                     </a-form-model-item>
                 </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-input placeholder="请输入" v-model="record.quantity" ></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-input placeholder="请输入" v-model="record.unQuantity" ></a-input>
                      </a-form-model-item>
                 </template>
                 <template slot="quantityExecuteIn" slot-scope="text, record, index">
@@ -84,112 +84,112 @@
                 </template>
                 <template slot="model" slot-scope="text, record, index">
                     <a-form-model-item prop="model" class='sonItem'>
-                        <a-input placeholder="请输入" v-model="record.model" :disabled="allowEdit=='no'"></a-input>
+                        <a-input placeholder="请输入" v-model="record.model" ></a-input>
                      </a-form-model-item>
                 </template>
                 <template slot="color" slot-scope="text, record, index">
                     <a-form-model-item prop="color" class='sonItem'>
-                        <a-input placeholder="请输入" v-model="record.color" :disabled="allowEdit=='no'"></a-input>
+                        <a-input placeholder="请输入" v-model="record.color" ></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-input placeholder="请输入" v-model="record.fixedNum" ></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-input placeholder="请输入" v-model="record.fixedLength" ></a-input>
                      </a-form-model-item>
                 </template>
                 <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-input placeholder="请输入" v-model="record.widthHeight"></a-input>
                      </a-form-model-item>
                 </template>
                 <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-input placeholder="请输入" v-model="record.pieces" ></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-input placeholder="请输入" v-model="record.remarks" ></a-input>
                      </a-form-model-item>
                 </template>
                 <template slot="meterWeight" slot-scope="text, record, index">
                     <a-form-model-item prop="meterWeight" class='sonItem'>
-                        <a-input placeholder="请输入" v-model="record.meterWeight" :disabled="allowEdit=='no'"></a-input>
+                        <a-input placeholder="请输入" v-model="record.meterWeight" ></a-input>
                      </a-form-model-item>
                 </template>
                 <template slot="decorationLength" slot-scope="text, record, index">
                     <a-form-model-item prop="decorationLength" class='sonItem'>
-                        <a-input placeholder="请输入" v-model="record.decorationLength" :disabled="allowEdit=='no'"></a-input>
+                        <a-input placeholder="请输入" v-model="record.decorationLength" ></a-input>
                      </a-form-model-item>
                 </template>
                 <template slot="windowNo" slot-scope="text, record, index">
                     <a-form-model-item prop="windowNo" class='sonItem'>
-                        <a-input placeholder="请输入" v-model="record.windowNo" :disabled="allowEdit=='no'"></a-input>
+                        <a-input placeholder="请输入" v-model="record.windowNo"></a-input>
                      </a-form-model-item>
                 </template>
                 <template slot="exclusiveZone" slot-scope="text, record, index">
                     <a-form-model-item prop="exclusiveZone" class='sonItem'>
-                        <a-input placeholder="请输入" v-model="record.exclusiveZone" :disabled="allowEdit=='no'"></a-input>
+                        <a-input placeholder="请输入" v-model="record.exclusiveZone"></a-input>
                      </a-form-model-item>
                 </template>
                 <template slot="widthLength" slot-scope="text, record, index">
                     <a-form-model-item prop="widthLength" class='sonItem'>
-                        <a-input placeholder="请输入" v-model="record.widthLength" :disabled="allowEdit=='no'"></a-input>
+                        <a-input placeholder="请输入" v-model="record.widthLength" ></a-input>
                      </a-form-model-item>
                 </template>
                 <template slot="height" slot-scope="text, record, index">
                     <a-form-model-item prop="height" class='sonItem'>
-                        <a-input placeholder="请输入" v-model="record.height" :disabled="allowEdit=='no'"></a-input>
+                        <a-input placeholder="请输入" v-model="record.height" ></a-input>
                      </a-form-model-item>
                 </template>
                 <template slot="buildingNumber" slot-scope="text, record, index">
                     <a-form-model-item prop="buildingNumber" class='sonItem'>
-                        <a-input placeholder="请输入" v-model="record.buildingNumber" :disabled="allowEdit=='no'"></a-input>
+                        <a-input placeholder="请输入" v-model="record.buildingNumber" ></a-input>
                      </a-form-model-item>
                 </template>
                 <template slot="framesTang" slot-scope="text, record, index">
                     <a-form-model-item prop="framesTang" class='sonItem'>
-                        <a-input placeholder="请输入" v-model="record.framesTang" :disabled="allowEdit=='no'"></a-input>
+                        <a-input placeholder="请输入" v-model="record.framesTang" ></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>
+                        <a-input placeholder="请输入" v-model="record.semiClass"</a-input>
                      </a-form-model-item>
                 </template>
                 <template slot="area" slot-scope="text, record, index">
                     <a-form-model-item prop="area" class='sonItem'>
-                        <a-input placeholder="请输入" v-model="record.area" :disabled="allowEdit=='no'"></a-input>
+                        <a-input placeholder="请输入" v-model="record.area" ></a-input>
                      </a-form-model-item>
                 </template>
                 <template slot="cuttingLength" slot-scope="text, record, index">
                     <a-form-model-item prop="cuttingLength" class='sonItem'>
-                        <a-input placeholder="请输入" v-model="record.cuttingLength" :disabled="allowEdit=='no'"></a-input>
+                        <a-input placeholder="请输入" v-model="record.cuttingLength" ></a-input>
                      </a-form-model-item>
                 </template>
                 <template slot="cuttingLeftDown" slot-scope="text, record, index">
                     <a-form-model-item prop="cuttingLeftDown" class='sonItem'>
-                        <a-input placeholder="请输入" v-model="record.cuttingLeftDown" :disabled="allowEdit=='no'"></a-input>
+                        <a-input placeholder="请输入" v-model="record.cuttingLeftDown"></a-input>
                      </a-form-model-item>
                 </template>
                 <template slot="cuttingRightTop" slot-scope="text, record, index">
                     <a-form-model-item prop="cuttingRightTop" class='sonItem'>
-                        <a-input placeholder="请输入" v-model="record.cuttingRightTop" :disabled="allowEdit=='no'"></a-input>
+                        <a-input placeholder="请输入" v-model="record.cuttingRightTop"></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>
+                        <a-input placeholder="请输入" v-model="record.series" ></a-input>
                      </a-form-model-item>
                 </template>
                 <template slot="glassNumber" slot-scope="text, record, index">
                     <a-form-model-item prop="glassNumber" class='sonItem'>
-                        <a-input placeholder="请输入" v-model="record.glassNumber" :disabled="allowEdit=='no'"></a-input>
+                        <a-input placeholder="请输入" v-model="record.glassNumber"></a-input>
                      </a-form-model-item>
                 </template>
             </a-table>
@@ -215,8 +215,8 @@
       return {
         selectedRowKeys:[],
         selectedRows:[],
+        planOrg:'',
         dataSource:[],
-        allowEdit:'yes',
         columns: [
                 {
                     title: '#',
@@ -525,11 +525,11 @@
             this.dataSource.unshift({rowNo: this.dataSource.length+1,projectCode:projectCode,projectName:projectName})
         },
         onSearchInven(record){
-            if(this.allowEdit=='no'){
-                this.$message.warning('不可编辑！')
+            if(!this.planOrg||this.planOrg==''){
+                this.$message.warning('请选择生产组织！')
             }else{
                 this.$refs.inventoryPopup.visible = true
-                this.$refs.inventoryPopup.getData()
+                this.$refs.inventoryPopup.getData(this.planOrg)
                 this.$refs.inventoryPopup.record=record
             }
         },

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

@@ -37,7 +37,7 @@
         selectedRows:[],
         dataSource:[],
         columns: [
-        {
+                {
                     title: '#',
                     dataIndex: '',
                     key: 'rowIndex',
@@ -76,6 +76,7 @@
                     align:"center",
                     dataIndex: 'inventoryCode',
                     ellipsis: true,
+
                 },
                 {
                     title: '料品名称',
@@ -100,7 +101,6 @@
                     align:"center",
                     dataIndex: 'quantity',
                     ellipsis: true,
-
                 },
                 {
                     title: '成品辅数量',
@@ -245,9 +245,7 @@
                     align:"center",
                     dataIndex: 'framesTang',
                     ellipsis: true,
-                },
-                
-                
+                }, 
                 {
                     title: '半成品分类',
                     align:"center",

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

@@ -10,7 +10,7 @@
       >
       <template slot="footer">
         <a-button  @click="handleCancel">关闭</a-button>
-        <a-button type="primary"  @click="handleOk" v-if="allowEdit=='yes'">保存</a-button>
+        <a-button type="primary"  @click="handleOk" >保存</a-button>
      </template>
       <a-card :bordered="false" class="top" style="margin-bottom:1%;margin-top:1%" :loading = 'loading'>
         <div class="table-page-search-wrapper">
@@ -18,7 +18,7 @@
                 <a-row :gutter="24">
                     <a-col :md="4" :sm="24">
                         <a-form-item label="生产组织">
-                            <a-input-search placeholder="请输入" v-model="form.productionOrg"  @search="onSearchProductionOrg" readOnly></a-input-search>
+                            <a-input-search placeholder="请输入" v-model="form.orgName"  @search="onSearchProductionOrg" readOnly></a-input-search>
                         </a-form-item>
                     </a-col>
                     <a-col  :md="4" :sm="24">
@@ -28,15 +28,12 @@
                     </a-col>
                     <a-col :md="4" :sm="24">
                         <a-form-item label="单据日期">
-                            <a-date-picker showTime valueFormat="YYYY-MM-DD" format = "YYYY-MM-DD" v-model="form.orderDate" style="width:100%" :disabled="allowEdit=='no'"/>
+                            <a-date-picker showTime valueFormat="YYYY-MM-DD" format = "YYYY-MM-DD" v-model="form.orderDate" style="width:100%" />
                         </a-form-item>
                     </a-col>
                     <a-col :md="4" :sm="24">
                         <a-form-item label="单据状态">
-                            <a-select v-model="form.state"  style='width:100%' disabled>
-                                <a-select-option value='自由'> 自由</a-select-option>
-                                <a-select-option value='已批准'> 已批准</a-select-option>
-                            </a-select>
+                            <a-input placeholder="请输入" v-model="form.state"  disabled></a-input>
                         </a-form-item>
                     </a-col>
                     <a-col :md="4" :sm="24">
@@ -50,18 +47,18 @@
                         </a-form-item>
                     </a-col>
                     <a-col :md="4" :sm="24">
-                        <a-form-item label="项目">
+                        <a-form-item label="项目名称">
                             <a-input-search placeholder="请输入" v-model="form.projectName" @search="onSearchProject" readOnly></a-input-search>
                         </a-form-item>
                     </a-col>
                     <a-col :md="4" :sm="24">
-                        <a-form-item label="备注">
-                            <a-input-search placeholder="请输入" v-model="form.remarks"  @search="onSearch" :disabled="allowEdit=='no'"></a-input-search>
+                        <a-form-item label="项目编码" >
+                            <a-input placeholder="请输入" v-model="form.projectCode" disabled></a-input>
                         </a-form-item>
                     </a-col>
                     <a-col :md="4" :sm="24">
                         <a-form-item label="业务类型">
-                            <a-select v-model="form.type"  style='width:100%'  :disabled="allowEdit=='no'">
+                            <a-select v-model="form.type"  style='width:100%'  >
                                 <a-select-option value='工装'> 工装</a-select-option>
                                 <a-select-option value='家装'> 家装</a-select-option>
                             </a-select>
@@ -79,33 +76,22 @@
                     </a-col>
                     <a-col :md="4" :sm="24">
                         <a-form-item label="工单号">
-                            <a-input placeholder="请输入" v-model="form.workNo" :disabled="allowEdit=='no'"></a-input>
-                        </a-form-item>
-                    </a-col>
-                    <a-col :md="4" :sm="24">
-                        <a-form-item label="项目编码" >
-                            <a-input placeholder="请输入" v-model="form.projectCode" disabled></a-input>
+                            <a-input placeholder="请输入" v-model="form.workNo" ></a-input>
                         </a-form-item>
                     </a-col>
                     <a-col :md="4" :sm="24">
-                        <a-form-item label="来源标识" >
-                            <a-input placeholder="请输入" v-model="form.sourceInfo" :disabled="allowEdit=='no'"></a-input>
-                        </a-form-item>
-                    </a-col>
-                    <a-col :md="4" :sm="24">
-                        <a-form-item label="改单版本" >
-                            <a-input placeholder="请输入" v-model="form.version" :disabled="allowEdit=='no'"></a-input>
+                        <a-form-item label="备注">
+                            <a-input-search placeholder="请输入" v-model="form.remarks"  @search="onSearch" ></a-input-search>
                         </a-form-item>
-                    </a-col>
-                    
+                    </a-col>                    
                 </a-row>
             </a-form>
         </div>
      </a-card>
      <a-card :bordered="false" class="three" style="margin-bottom:1%" :loading = 'loading'>
        <div class="table-operator">
-            <a-button type="danger" size="small"  @click="addList" :disabled="allowEdit=='no'">增行</a-button>
-            <a-button size="small" @click="delectRow" :disabled="allowEdit=='no'">删行</a-button>
+            <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" >
@@ -116,19 +102,19 @@
                     <a-menu-item><a>销售出库</a></a-menu-item>
                 </a-menu>
             </a-dropdown>
-            <a-dropdown>
+            <!-- <a-dropdown>
                 <a-button size="small"> 委外 <a-icon type="down" /> </a-button>
                 <a-menu slot="overlay" >
                     <a-menu-item ><a @click="changeChose('生产出入库页签')">生产出入库页签</a></a-menu-item>
-                    <a-menu-item v-if="allowEdit!=='no'"><a @click="changeChose('选择委外材料明细')">选择委外材料明细</a></a-menu-item>
-                    <a-menu-item v-if="allowEdit!=='no'"><a @click="changeChose('修改入库颜色')">修改入库颜色</a></a-menu-item>
-                    <a-menu-item v-if="allowEdit!=='no'"><a @click="changeChose('修改出库颜色')">修改出库颜色</a></a-menu-item>
-                    <a-menu-item v-if="allowEdit!=='no'"><a @click="changeChose('委外增行')">委外增行</a></a-menu-item>
-                    <a-menu-item v-if="allowEdit!=='no'"><a @click="changeChose('委外拆分行')">委外拆分行</a></a-menu-item>
-                    <a-menu-item v-if="allowEdit!=='no'"><a @click="changeChose('委外删行')">委外删行</a></a-menu-item>
-                    <a-menu-item v-if="allowEdit!=='no'"><a @click="changeChose('委外保存')">委外保存</a></a-menu-item>
+                    <a-menu-item ><a @click="changeChose('选择委外材料明细')">选择委外材料明细</a></a-menu-item>
+                    <a-menu-item ><a @click="changeChose('修改入库颜色')">修改入库颜色</a></a-menu-item>
+                    <a-menu-item ><a @click="changeChose('修改出库颜色')">修改出库颜色</a></a-menu-item>
+                    <a-menu-item ><a @click="changeChose('委外增行')">委外增行</a></a-menu-item>
+                    <a-menu-item ><a @click="changeChose('委外拆分行')">委外拆分行</a></a-menu-item>
+                    <a-menu-item ><a @click="changeChose('委外删行')">委外删行</a></a-menu-item>
+                    <a-menu-item ><a @click="changeChose('委外保存')">委外保存</a></a-menu-item>
                 </a-menu>
-            </a-dropdown>
+            </a-dropdown> -->
        </div>
        <a-tabs v-model="activeKey" @change="handleChangeTabs">
             <a-tab-pane tab="成品明细" :key="refKeys[0]" :forceRender="true">
@@ -137,11 +123,11 @@
             <a-tab-pane tab="材料明细" :key="refKeys[1]" :forceRender="true">
                <material ref="material" @changeEdit = 'changeEdit' @clearn="clearnExecute"></material>
             </a-tab-pane>
-            <a-tab-pane tab="委外其他出库" :key="refKeys[2]" :forceRender="true">
-                <Outbound ref='Outbound' @changeOutColor ='changeEdit'></Outbound>
+            <a-tab-pane tab="入库暂存" :key="refKeys[2]" :forceRender="true">
+                <TemporaryStorage ref='TemporaryStorage'></TemporaryStorage>
             </a-tab-pane>
-            <a-tab-pane tab="委外其他入库" :key="refKeys[3]" :forceRender="true">
-                <Warehousing ref='Warehousing' @changeWareColor ='changeEdit'></Warehousing>
+            <a-tab-pane tab="余料管理" :key="refKeys[3]" :forceRender="true">
+                <SurplusMaterials ref='SurplusMaterials' ></SurplusMaterials>
             </a-tab-pane>
         </a-tabs>
        
@@ -158,8 +144,8 @@
       import { JEditableTableModelMixin } from '@/mixins/JEditableTableModelMixin'
       import productDetails from './productDetails'
       import material from './material'
-      import Outbound from './Outbound'
-      import Warehousing from './Warehousing'
+      import TemporaryStorage from './TemporaryStorage'
+      import SurplusMaterials from './SurplusMaterials'
       import moment from "moment"
       import { httpAction ,getAction,postAction,putAction} from '@/api/manage'
       import organizationPopup from '../../Popup/organizationPopup.vue'
@@ -172,8 +158,8 @@
         components: {
             productDetails,
             material,
-            Outbound,
-            Warehousing,
+            TemporaryStorage,
+            SurplusMaterials,
             organizationPopup,
             OperatorsPopup,
             deparmentPopup,
@@ -186,15 +172,13 @@
             form1:{},
             execute:undefined,
             defaultMethod:'add',
-            allowEdit:'yes',
-            allowEditMaterial:'no',
             dataSource:[],
             loading:false,
             // ipagination:{},
             selectedRowKeys:[],
             selectedRows:[],
             activeKey:'finishProduct',
-            refKeys:['finishProduct','material','Outbound','Warehousing'],
+            refKeys:['finishProduct','material','TemporaryStorage','SurplusMaterials'],
           }
         },
         created() {
@@ -204,48 +188,44 @@
             handleCancel(){
                 this.visible=false
                 this.defaultMethod='add'
-                this.allowEdit = 'yes'
                 this.activeKey='finishProduct',
                 this.execute = ''
                 this.dataSource = [] 
                 this.form={}
                 this.form1={}
-                this.$refs.material.allowEditMaterial ='no'
-                this.$refs.Warehousing.allowEditColor ='no'
-                this.$refs.Outbound.allowEditColor ='no'
                 this.$emit('ok')
             },
-            changeChose(prop){
-                if(prop=='选择委外材料明细'){
-                    this.$refs.material.allowEditMaterial ='yes'
-                    this.activeKey = 'material'
-                }else if(prop == '修改入库颜色'){
-                    this.$refs.Warehousing.allowEditColor ='yes'
-                    this.activeKey = 'Warehousing'
-                }else if(prop == '修改出库颜色'){
-                    this.$refs.Outbound.allowEditColor ='yes'
-                    this.activeKey = 'Outbound'
-                }else if(prop == '委外增行'){
-                    this.$refs.material.addMaterial()
-                    this.activeKey = 'material'
-                }else if(prop =='委外拆分行'){
-                    this.$refs.material.copyRow()
-                    this.activeKey = 'material'
-                }else if(prop =='委外删行'){
-                    this.$refs.material.delecteCopyRow()
-                    this.activeKey = 'material'
-                }else if(prop =='委外保存'){
-                    this.changeEdit()
-                }else if(prop=='生产出入库页签'){
-                    this.generateList()
-                }
-            },
+            // changeChose(prop){
+            //     if(prop=='选择委外材料明细'){
+            //         this.$refs.material.allowEditMaterial ='yes'
+            //         this.activeKey = 'material'
+            //     }else if(prop == '修改入库颜色'){
+            //         this.$refs.SurplusMaterials.allowEditColor ='yes'
+            //         this.activeKey = 'SurplusMaterials'
+            //     }else if(prop == '修改出库颜色'){
+            //         this.$refs.TemporaryStorage.allowEditColor ='yes'
+            //         this.activeKey = 'TemporaryStorage'
+            //     }else if(prop == '委外增行'){
+            //         this.$refs.material.addMaterial()
+            //         this.activeKey = 'material'
+            //     }else if(prop =='委外拆分行'){
+            //         this.$refs.material.copyRow()
+            //         this.activeKey = 'material'
+            //     }else if(prop =='委外删行'){
+            //         this.$refs.material.delecteCopyRow()
+            //         this.activeKey = 'material'
+            //     }else if(prop =='委外保存'){
+            //         this.changeEdit()
+            //     }else if(prop=='生产出入库页签'){
+            //         this.generateList()
+            //     }
+            // },
             generateList(){
                 getAction('/productionOrder/madeProductionOrders/createTabs',{id:this.form.id}).then(res=>{
                     if(res.success){
                        this.$message.success('执行成功！');
-                       this.getOutboundData(this.form.id)
-                       this.getWarehousingData(this.form.id)
+                       this.getTemporaryStorageData(this.form.id)
+                       this.getSurplusMaterialsData(this.form.id)
                     }else{
                       this.$message.error(res.message);
                     }
@@ -255,8 +235,8 @@
                 var madeProductionOrdersPage = this.form
                 madeProductionOrdersPage.madeProductionOrdersFinishedList = this.$refs.productDetails.dataSource
                 madeProductionOrdersPage.madeProductionOrdersMaterialList = this.$refs.material.dataSource
-                madeProductionOrdersPage.madeProductionOrdersOutList = this.$refs.Outbound.dataSource
-                madeProductionOrdersPage.madeProductionOrdersInList = this.$refs.Warehousing.dataSource
+                madeProductionOrdersPage.madeProductionOrdersOutList = this.$refs.TemporaryStorage.dataSource
+                madeProductionOrdersPage.madeProductionOrdersInList = this.$refs.SurplusMaterials.dataSource
                 this.loading = true
                 if(this.defaultMethod=='add'){
                     postAction('/productionOrder/madeProductionOrders/add', madeProductionOrdersPage).then((res) => {
@@ -288,15 +268,15 @@
                 var madeProductionOrdersPage = this.form
                 madeProductionOrdersPage.madeProductionOrdersFinishedList = this.$refs.productDetails.dataSource
                 madeProductionOrdersPage.madeProductionOrdersMaterialList = this.$refs.material.dataSource
-                madeProductionOrdersPage.madeProductionOrdersOutList = this.$refs.Outbound.dataSource
-                madeProductionOrdersPage.madeProductionOrdersInList = this.$refs.Warehousing.dataSource
+                madeProductionOrdersPage.madeProductionOrdersOutList = this.$refs.TemporaryStorage.dataSource
+                madeProductionOrdersPage.madeProductionOrdersInList = this.$refs.SurplusMaterials.dataSource
                 postAction('/productionOrder/madeProductionOrders/editChild', madeProductionOrdersPage).then((res) => {
                         if (res.success) {
                             console.log(res.message);
                             this.$refs.productDetails.dataSource = madeProductionOrdersPage.madeProductionOrdersFinishedList
                             this.$refs.material.dataSource = madeProductionOrdersPage.madeProductionOrdersMaterialList
-                            this.$refs.Outbound.dataSource = madeProductionOrdersPage.madeProductionOrdersOutList
-                            this.$refs.Warehousing.dataSource = madeProductionOrdersPage.madeProductionOrdersInList
+                            this.$refs.TemporaryStorage.dataSource = madeProductionOrdersPage.madeProductionOrdersOutList
+                            this.$refs.SurplusMaterials.dataSource = madeProductionOrdersPage.madeProductionOrdersInList
                         } else {
                             this.$message.error(res.message);
                         }
@@ -316,8 +296,8 @@
                        this.form=res.result
                        this.getProductData(this.form.id)
                        this.getMaterialData(this.form.id)
-                       this.getOutboundData(this.form.id)
-                       this.getWarehousingData(this.form.id)
+                       this.getTemporaryStorageData(this.form.id)
+                       this.getSurplusMaterialsData(this.form.id)
                     }else{
                       this.$message.error(res.message);
                     }
@@ -326,7 +306,6 @@
             //获取子表信息
             getProductData(id){
                 //成品明细
-                this.$refs.productDetails.allowEdit = this.allowEdit
                 getAction('/productionOrder/madeProductionOrders/queryMadeProductionOrdersFinishedByMainId',{id:id}).then(res=>{
                     if(res.success){
                         this.$refs.productDetails.dataSource =res.result
@@ -342,7 +321,6 @@
             //获取子表信息
             getMaterialData(id){
                 //材料明细
-                this.$refs.material.allowEdit = this.allowEdit
                 getAction('/productionOrder/madeProductionOrders/queryMadeProductionOrdersMaterialByMainId',{id:id}).then(res=>{
                     if(res.success){
                         this.$refs.material.dataSource =res.result
@@ -356,12 +334,12 @@
                 })
             },
              //获取子表信息
-             getOutboundData(id){
-                //委外出库
+             getTemporaryStorageData(id){
+                //入库暂存
                 getAction('/productionOrder/madeProductionOrders/queryMadeProductionOrdersOutByMainId',{id:id}).then(res=>{
                     if(res.success){
-                        this.$refs.Outbound.dataSource =res.result
-                        this.$refs.Outbound.dataSource.map((item,index)=>{
+                        this.$refs.TemporaryStorage.dataSource =res.result
+                        this.$refs.TemporaryStorage.dataSource.map((item,index)=>{
                             item.rowNo =index+1
                        })
                     }else{
@@ -370,28 +348,17 @@
                 })
             },
             onSearchProductionOrg(){ 
-                if(this.allowEdit=='no'){
-                    this.$message.warning('不可编辑！')
-                }else{
+                
                     this.$refs.organizationPopup.visible = true
                     this.$refs.organizationPopup.getData()
-                }
             },
             onSearchPerson(){
-                if(this.allowEdit=='no'){
-                    this.$message.warning('不可编辑！')
-                }else{
                     this.$refs.OperatorsPopup.visible = true
                     this.$refs.OperatorsPopup.getData()
-                }
             },
             onSearchPlanDept(){
-                if(this.allowEdit=='no'){
-                    this.$message.warning('不可编辑！')
-                }else{
                     this.$refs.deparmentPopup.visible = true
                     this.$refs.deparmentPopup.getData()
-                }
             },
             okData(data){
                 this.$set(this.form,'projectCode',data.Code)
@@ -407,20 +374,20 @@
                 })
             },
             onSearchProject(){
-                if(this.allowEdit=='no'){
-                    this.$message.warning('不可编辑！')
-                }else{
-                    this.$refs.projectPopup.visible = true
-                    this.$refs.projectPopup.getData()
-                }
+                    if(this.form.orgName&&this.form.orgName!==''){
+                        this.$refs.projectPopup.visible = true
+                        this.$refs.projectPopup.getData(this.form.planOrg)
+                    }else{
+                        this.$message.warning('请选择生产组织！')
+                    }
             },
             //获取子表信息
-            getWarehousingData(id){
-                //委外入库
+            getSurplusMaterialsData(id){
+                //余料管理
                 getAction('/productionOrder/madeProductionOrders/queryMadeProductionOrdersInByMainId',{id:id}).then(res=>{
                     if(res.success){
-                        this.$refs.Warehousing.dataSource =res.result
-                        this.$refs.Warehousing.dataSource.map((item,index)=>{
+                        this.$refs.SurplusMaterials.dataSource =res.result
+                        this.$refs.SurplusMaterials.dataSource.map((item,index)=>{
                             item.rowNo =index+1
                        })
                        
@@ -432,38 +399,39 @@
             addList(){
                 if(this.activeKey=='finishProduct'){
                     this.$refs.productDetails.addList(this.form.projectCode,this.form.projectName)
+                    this.$refs.productDetails.planOrg=this.form.planOrg
                 }else if(this.activeKey=='material'){
                     this.$refs.material.addList(this.form.projectCode,this.form.projectName)
+                    this.$refs.material.planOrg=this.form.planOrg
+                }else if(this.activeKey=='SurplusMaterials'){
+                    this.$refs.SurplusMaterials.addList(this.form.projectCode,this.form.projectName)
+                    this.$refs.SurplusMaterials.planOrg=this.form.planOrg
                 }
-                // else if(this.activeKey=='Outbound'){
-                //     this.$refs.Outbound.addList()
-                // }else if(this.activeKey=='Warehousing'){
-                //     this.$refs.Warehousing.addList()
-                // }
             },
             delectRow(){
                 if(this.activeKey=='finishProduct'){
                     this.$refs.productDetails.delectRow()
                 }else if(this.activeKey=='material'){
                     this.$refs.material.delectRow()
+                }else if(this.activeKey=='SurplusMaterials'){
+                    this.$refs.SurplusMaterials.delectRow()
                 }
-                // else if(this.activeKey=='Outbound'){
-                //     this.$refs.Outbound.delectRow()
-                // }else if(this.activeKey=='Warehousing'){
-                //     this.$refs.Warehousing.delectRow()
-                // }
             },
             clearnExecute(){
                 this.execute = ''
             },
             okDataOrganization(data){
-                this.$set(this.form,'productionOrg',data.Name)
+                this.$set(this.form,'orgName',data.Name)
+                this.$set(this.form,'orgCode',data.Code)
+                this.$set(this.form,'planOrg',data.ID)
             },
             okDataOperators(data){
                 this.$set(this.form,'salesperson',data.Name)
+                this.$set(this.form,'salespersonId',data.ID)
             },
             okDataDeparment(data){
                 this.$set(this.form,'planDept',data.Name)
+                this.$set(this.form,'planDeptId',data.ID)
             },
 
         }
@@ -529,4 +497,7 @@
     /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/.highlight-row {
+        background-color: #E6F7FF;
+}
   </style>

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

@@ -109,10 +109,10 @@
                <materialDetail ref="materialDetail" ></materialDetail>
             </a-tab-pane>
             <a-tab-pane tab="委外其他出库" :key="refKeys[2]" :forceRender="true">
-                <OutboundDetail ref='OutboundDetail'></OutboundDetail>
+                <TemporaryStorageDetail ref='TemporaryStorageDetail'></TemporaryStorageDetail>
             </a-tab-pane>
             <a-tab-pane tab="委外其他入库" :key="refKeys[3]" :forceRender="true">
-                <WarehousingDetail ref='WarehousingDetail'></WarehousingDetail>
+                <SurplusMaterialsDetail ref='SurplusMaterialsDetail'></SurplusMaterialsDetail>
             </a-tab-pane>
         </a-tabs>
        
@@ -124,9 +124,9 @@
       import { FormTypes } from '@/utils/JEditableTableUtil'
       import { JEditableTableModelMixin } from '@/mixins/JEditableTableModelMixin'
       import materialDetail from './materialDetail'
-      import OutboundDetail from './OutboundDetail'
+      import TemporaryStorageDetail from './TemporaryStorageDetail'
       import productDetailsParticulars from './productDetailsParticulars'
-      import WarehousingDetail from './WarehousingDetail'
+      import SurplusMaterialsDetail from './SurplusMaterialsDetail'
       import moment from "moment"
       import { httpAction ,getAction,postAction,putAction} from '@/api/manage'
       export default {
@@ -134,9 +134,9 @@
         mixins: [JEditableTableModelMixin],
         components: {
             materialDetail,
-            OutboundDetail,
+            TemporaryStorageDetail,
             productDetailsParticulars,
-            WarehousingDetail
+            SurplusMaterialsDetail
         },
         data() {
           return {
@@ -148,7 +148,7 @@
             selectedRowKeys:[],
             selectedRows:[],
             activeKey:'finishProduct',
-            refKeys:['finishProduct','material','Outbound','Warehousing'],
+            refKeys:['finishProduct','material','TemporaryStorage','SurplusMaterials'],
           }
         },
         created() {
@@ -173,7 +173,7 @@
                        this.form=res.result
                        this.getProductData(this.form.id)
                        this.getMaterialData(this.form.id)
-                       this.getOutboundData(this.form.id)
+                       this.getTemporaryStorageData(this.form.id)
                        this.getWarehousingData(this.form.id)
                     }else{
                       this.$message.error(res.message);
@@ -211,12 +211,12 @@
                 })
             },
              //获取子表信息
-             getOutboundData(id){
+             getTemporaryStorageData(id){
                 //委外出库
                 getAction('/productionOrder/madeProductionOrders/queryMadeProductionOrdersOutByMainId',{id:id}).then(res=>{
                     if(res.success){
-                        this.$refs.OutboundDetail.dataSource =res.result
-                        this.$refs.OutboundDetail.dataSource.map((item,index)=>{
+                        this.$refs.TemporaryStorageDetail.dataSource =res.result
+                        this.$refs.TemporaryStorageDetail.dataSource.map((item,index)=>{
                             item.rowNo =index+1
                        })
                     }else{
@@ -225,12 +225,12 @@
                 })
             },
             //获取子表信息
-            getWarehousingData(id){
-                //委外入库
+            getSurplusMaterialsDetailData(id){
+                //余料管理
                 getAction('/productionOrder/madeProductionOrders/queryMadeProductionOrdersInByMainId',{id:id}).then(res=>{
                     if(res.success){
-                        this.$refs.WarehousingDetail.dataSource =res.result
-                        this.$refs.WarehousingDetail.dataSource.map((item,index)=>{
+                        this.$refs.SurplusMaterialsDetail.dataSource =res.result
+                        this.$refs.SurplusMaterialsDetail.dataSource.map((item,index)=>{
                             item.rowNo =index+1
                        })
                        

src/views/production/productionTotalOrder/productionTotalOrderList.vue

@@ -24,8 +24,10 @@
                   <a-col :md="4" :sm="24">
                     <a-form-item label="单据状态">
                       <a-select v-model="queryParam.state"  style='width:100%' >
-                        <a-select-option value='自由'> 自由</a-select-option>
-                        <a-select-option value='已批准'> 已批准</a-select-option>
+                        <a-select-option value='开立'> 开立</a-select-option>
+                        <a-select-option value='审核'> 审核</a-select-option>
+                        <a-select-option value='已运算'> 已运算</a-select-option>
+                        <a-select-option value='关闭'> 关闭</a-select-option>
                        </a-select>
                     </a-form-item>
                   </a-col>
@@ -210,7 +212,7 @@
                 {
                   title: '生产组织',
                   align:"center",
-                  dataIndex: 'productionOrg',
+                  dataIndex: 'orgName',
                   ellipsis: true,
     
                 },
@@ -384,7 +386,6 @@
               }else if(this.selectedRowKeys.length>1){
                 this.$message.warning('请选择一条数据！')
               }else{
-                this.$refs.productionTotalOrderAdd.allowEdit = this.selectedRows[0].state=='已批准'?'no':'yes'
                 this.$refs.productionTotalOrderAdd.visible=true
                 this.$refs.productionTotalOrderAdd.defaultMethod='edit'
                 this.$refs.productionTotalOrderAdd.getMainData(this.selectedRowKeys[0])