diff --git a/src/views/modules/part/partCostInformation.vue b/src/views/modules/part/partCostInformation.vue
index 16d3d52..a4c8d9d 100644
--- a/src/views/modules/part/partCostInformation.vue
+++ b/src/views/modules/part/partCostInformation.vue
@@ -92,25 +92,25 @@
               </el-form-item>
             </el-form>
             <el-form :inline="true" label-position="top" :model="modalData" style="margin-top: -5px;">
-              <el-form-item label="产品组编码" prop="otherGroup1">
+              <el-form-item label="商品组1编码" prop="otherGroup1">
                 <el-input v-model="modalData.otherGroup1" disabled style="width: 128px"></el-input>
               </el-form-item>
-              <el-form-item label="产品组描述" prop="otherGroupName1">
+              <el-form-item label="商品组1描述" prop="otherGroupName1">
                 <el-input v-model="modalData.otherGroupName1" disabled style="width: 330px"></el-input>
               </el-form-item>
             </el-form>
             <el-form :inline="true" label-position="top" :model="modalData" style="margin-top: -5px;">
               <el-form-item label="单位标准成本" prop="standardCost">
-                <el-input v-model="modalData.standardCost" class="inlineNumber numInput" style="width: 107px"></el-input>
+                <el-input v-model="modalData.standardCost" @change="standardCostChange()" placeholder="最多6位小数" class="inlineNumber numInput" style="width: 107px"></el-input>
               </el-form-item>
               <el-form-item label="标准成本货币" prop="standardCostCurrency" :show-message="false">
                 <span slot="label">
                 <a @click="getBaseList(512)">标准成本货币</a>
               </span>
-                <el-input v-model="modalData.standardCostCurrency"  disabled style="width: 108px"></el-input>
+                <el-input v-model="modalData.standardCostCurrency" disabled @change="standardCostCurrencyChange()" style="width: 108px"></el-input>
               </el-form-item>
               <el-form-item label="单位实际成本" prop="actualCost">
-                <el-input v-model="modalData.actualCost" class="inlineNumber numInput" style="width: 107px"></el-input>
+                <el-input v-model="modalData.actualCost" placeholder="最多6位小数" class="inlineNumber numInput" style="width: 107px"></el-input>
               </el-form-item>
               <el-form-item label="实际成本货币" prop="actualCostCurrency" :show-message="false">
                 <span slot="label">
@@ -332,7 +332,7 @@ export default {
           columnProp: 'otherGroup1',
           headerAlign: 'center',
           align: 'center',
-          columnLabel: '产品组编码',
+          columnLabel: '商品组1编码',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
@@ -350,7 +350,7 @@ export default {
           columnProp: 'otherGroupName1',
           headerAlign: 'center',
           align: 'center',
-          columnLabel: '产品组描述',
+          columnLabel: '商品组1描述',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
@@ -577,6 +577,9 @@ export default {
     getBaseData(val){
         if (this.tagNo === 512){
           this.modalData.standardCostCurrency = val.Currency
+          if (this.modalData.actualCostCurrency === '' || this.modalData.actualCostCurrency == null){
+            this.modalData.actualCostCurrency = val.Currency
+          }
         }
         if (this.tagNo === 513){
           this.modalData.actualCostCurrency = val.Currency
@@ -749,6 +752,12 @@ export default {
       }
       this.modalFlag = false
     },
+
+    standardCostChange(){
+      if (this.modalData.actualCost === '' || this.modalData.actualCost === null){
+        this.modalData.actualCost = this.modalData.standardCost
+      }
+    }
   }
 }
 </script>
diff --git a/src/views/modules/part/partProductGroupInformation.vue b/src/views/modules/part/partProductGroupInformation.vue
index f5fefcd..6f7c035 100644
--- a/src/views/modules/part/partProductGroupInformation.vue
+++ b/src/views/modules/part/partProductGroupInformation.vue
@@ -252,7 +252,7 @@
         </el-form>
         <el-table
           title="条件"
-          :height="height - 370"
+          height="205px"
           ref="conditionTable"
           :data="productGroupPtmConditionList"
           @current-change="currentConditionChangeHandle"
@@ -280,7 +280,7 @@
         <el-tab-pane label="参数" name="first">
           <el-button type="primary" @click="updatePtmConditionItemModal" style="margin-top: 5px">编辑</el-button>
           <el-table
-            :height="height - 300"
+            height="255px"
             :data="productGroupPtmConditionItemList"
             border
             style="width: 100%">
@@ -309,7 +309,7 @@
         <el-tab-pane label="工序Process Time" name="second">
           <el-button type="primary" @click="updatePtmConditionProcessModal" style="margin-top: 5px">编辑</el-button>
           <el-table
-            :height="height - 369"
+            height="205px"
             :data="productGroupPtmConditionProcessList"
             border
             style="width: 100%;">
@@ -426,8 +426,8 @@
             </div>
             <div v-else>
               <el-input v-model="scope.row.machCycleTime" v-if="item.columnProp === 'machCycleTime'" @change="changeMachCycleTime(scope.row)" class="inlineNumber numInput"></el-input>
-              <el-input v-model="scope.row.laborCycleTime" v-if="item.columnProp === 'laborCycleTime'" @change="changeLaborCycleTime(scope.row)" class="inlineNumber numInput"></el-input>
               <el-input v-model="scope.row.machRunFactor" v-if="item.columnProp === 'machRunFactor'" @change="changeMachRunFactor(scope.row)" class="inlineNumber numInput"></el-input>
+              <el-input v-model="scope.row.laborCycleTime" v-if="item.columnProp === 'laborCycleTime'" @change="changeLaborCycleTime(scope.row)" class="inlineNumber numInput"></el-input>
               <el-input v-model="scope.row.laborRunFactor" v-if="item.columnProp === 'laborRunFactor'" class="inlineNumber numInput"></el-input>
             </div>
           </template>
@@ -752,25 +752,6 @@ export default {
         },
       ],
       stdProcessColumnList: [
-        {
-          userId: this.$store.state.user.name,
-          functionId: 601006,
-          serialNumber: '601006Table2BuDesc',
-          tableId: "601006Table2",
-          tableName: "标准工序表",
-          columnProp: 'buDesc',
-          headerAlign: "center",
-          align: "center",
-          columnLabel: 'BU',
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: '',
-          columnWidth: 70,
-          isVisible: false // 控制显示的属性
-        },
         {
           userId: this.$store.state.user.name,
           functionId: 601006,
@@ -809,6 +790,42 @@ export default {
           columnWidth: 170,
           isVisible: true // 控制显示的属性
         },
+        {
+          functionId: 601006,
+          serialNumber: '601006Table2WorkCenterNo',
+          tableId: '601006Table2',
+          tableName: '标准工序表',
+          columnProp: 'crewSize',
+          headerAlign: 'center',
+          align: 'right',
+          columnLabel: '生产过程人数',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 100,
+          isVisible: true // 控制显示的属性
+        },
+        {
+          functionId: 601006,
+          serialNumber: '601006Table2WorkCenterNo',
+          tableId: '601006Table2',
+          tableName: '标准工序表',
+          columnProp: 'setupCrewSize',
+          headerAlign: 'center',
+          align: 'right',
+          columnLabel: '调机过程人数',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 100,
+          isVisible: true // 控制显示的属性
+        },
         {
           functionId: 601006,
           serialNumber: '601006Table2WorkCenterNo',
@@ -851,29 +868,29 @@ export default {
           serialNumber: '601006Table2LaborClassDesc',
           tableId: "601006Table2",
           tableName: "标准工序表",
-          columnProp: 'laborClassDesc',
+          columnProp: 'laborClassNo',
           headerAlign: "center",
           align: "left",
-          columnLabel: '人员等级',
+          columnLabel: '人员等级编码',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
           sortLv: 0,
           status: true,
           fixed: '',
-          columnWidth: 80,
+          columnWidth: 100,
           isVisible: true // 控制显示的属性
         },
         {
           userId: this.$store.state.user.name,
           functionId: 601006,
-          serialNumber: '601006Table2SetupLaborClassDesc',
+          serialNumber: '601006Table2LaborClassDesc',
           tableId: "601006Table2",
           tableName: "标准工序表",
-          columnProp: 'setupLaborClassDesc',
+          columnProp: 'laborClassDesc',
           headerAlign: "center",
           align: "left",
-          columnLabel: '调机时人员等级',
+          columnLabel: '人员等级描述',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
@@ -886,51 +903,51 @@ export default {
         {
           userId: this.$store.state.user.name,
           functionId: 601006,
-          serialNumber: '601006Table2MachCycleTime',
+          serialNumber: '601006Table2SetupLaborClassDesc',
           tableId: "601006Table2",
           tableName: "标准工序表",
-          columnProp: 'machCycleTime',
+          columnProp: 'setupLaborClassNo',
           headerAlign: "center",
-          align: "right",
-          columnLabel: '机器处理时间',
+          align: "left",
+          columnLabel: '调机过程中人员等级编码',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
           sortLv: 0,
           status: true,
           fixed: '',
-          columnWidth: 100,
-          isVisible: false // 控制显示的属性
+          columnWidth: 118,
+          isVisible: true // 控制显示的属性
         },
         {
           userId: this.$store.state.user.name,
           functionId: 601006,
-          serialNumber: '601006Table2LaborCycleTime',
+          serialNumber: '601006Table2SetupLaborClassDesc',
           tableId: "601006Table2",
           tableName: "标准工序表",
-          columnProp: 'laborCycleTime',
+          columnProp: 'setupLaborClassDesc',
           headerAlign: "center",
-          align: "right",
-          columnLabel: '人工处理时间',
+          align: "left",
+          columnLabel: '调机过程中人员等级描述',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
           sortLv: 0,
           status: true,
           fixed: '',
-          columnWidth: 100,
-          isVisible: false // 控制显示的属性
+          columnWidth: 118,
+          isVisible: true // 控制显示的属性
         },
         {
           userId: this.$store.state.user.name,
           functionId: 601006,
-          serialNumber: '601006Table2MachRunFactor',
+          serialNumber: '601006Table2MachCycleTime',
           tableId: "601006Table2",
           tableName: "标准工序表",
-          columnProp: 'machRunFactor',
+          columnProp: 'machCycleTime',
           headerAlign: "center",
           align: "right",
-          columnLabel: '机器单位产出',
+          columnLabel: '机器处理时间',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
@@ -943,13 +960,13 @@ export default {
         {
           userId: this.$store.state.user.name,
           functionId: 601006,
-          serialNumber: '601006Table2LaborRunFactor',
+          serialNumber: '601006Table2MachRunFactor',
           tableId: "601006Table2",
           tableName: "标准工序表",
-          columnProp: 'laborRunFactor',
+          columnProp: 'machRunFactor',
           headerAlign: "center",
           align: "right",
-          columnLabel: '人工单位产出',
+          columnLabel: '机器单位产出',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
@@ -962,32 +979,13 @@ export default {
         {
           userId: this.$store.state.user.name,
           functionId: 601006,
-          serialNumber: '601006Table2CreateDate',
-          tableId: '601006Table2',
-          tableName: '标准工序表',
-          columnProp: 'createDate',
-          headerAlign: 'center',
-          align: 'center',
-          columnLabel: '创建时间',
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: '',
-          columnWidth: 170,
-          isVisible: true // 控制显示的属性
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 601006,
-          serialNumber: '601006Table2CreateBy',
+          serialNumber: '601006Table2LaborCycleTime',
           tableId: "601006Table2",
           tableName: "标准工序表",
-          columnProp: 'createBy',
+          columnProp: 'laborCycleTime',
           headerAlign: "center",
-          align: "left",
-          columnLabel: '创建人',
+          align: "right",
+          columnLabel: '人工处理时间',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
@@ -995,103 +993,101 @@ export default {
           status: true,
           fixed: '',
           columnWidth: 100,
-          isVisible: true // 控制显示的属性
+          isVisible: false // 控制显示的属性
         },
         {
           userId: this.$store.state.user.name,
           functionId: 601006,
-          serialNumber: '601006Table2UpdateDate',
+          serialNumber: '601006Table2LaborRunFactor',
           tableId: "601006Table2",
           tableName: "标准工序表",
-          columnProp: 'updateDate',
+          columnProp: 'laborRunFactor',
           headerAlign: "center",
-          align: "center",
-          columnLabel: '更新时间',
+          align: "right",
+          columnLabel: '人工单位产出',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
           sortLv: 0,
           status: true,
           fixed: '',
-          columnWidth: 170,
-          isVisible: true // 控制显示的属性
+          columnWidth: 100,
+          isVisible: false // 控制显示的属性
         },
+      ],
+      stdProcessColumnList1: [
         {
           userId: this.$store.state.user.name,
           functionId: 601006,
-          serialNumber: '601006Table2UpdateBy',
+          serialNumber: '601006Table2OperationNo',
           tableId: "601006Table2",
           tableName: "标准工序表",
-          columnProp: 'updateBy',
+          columnProp: 'operationNo',
           headerAlign: "center",
-          align: "left",
-          columnLabel: '更新人',
+          align: "center",
+          columnLabel: '工序号',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
           sortLv: 0,
           status: true,
           fixed: '',
-          columnWidth: 100,
+          columnWidth: 50,
           isVisible: true // 控制显示的属性
         },
-      ],
-      stdProcessColumnList1: [
         {
           userId: this.$store.state.user.name,
           functionId: 601006,
-          serialNumber: '601006Table2BuDesc',
+          serialNumber: '601006Table2OperationName',
           tableId: "601006Table2",
           tableName: "标准工序表",
-          columnProp: 'buDesc',
+          columnProp: 'operationName',
           headerAlign: "center",
-          align: "center",
-          columnLabel: 'BU',
+          align: "left",
+          columnLabel: '工序名称',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
           sortLv: 0,
           status: true,
           fixed: '',
-          columnWidth: 60,
+          columnWidth: 170,
           isVisible: true // 控制显示的属性
         },
         {
-          userId: this.$store.state.user.name,
           functionId: 601006,
-          serialNumber: '601006Table2OperationNo',
-          tableId: "601006Table2",
-          tableName: "标准工序表",
-          columnProp: 'operationNo',
-          headerAlign: "center",
-          align: "center",
-          columnLabel: '工序号',
+          serialNumber: '601006Table2WorkCenterNo',
+          tableId: '601006Table2',
+          tableName: '标准工序表',
+          columnProp: 'crewSize',
+          headerAlign: 'center',
+          align: 'right',
+          columnLabel: '生产过程人数',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
           sortLv: 0,
           status: true,
           fixed: '',
-          columnWidth: 50,
+          columnWidth: 100,
           isVisible: true // 控制显示的属性
         },
         {
-          userId: this.$store.state.user.name,
           functionId: 601006,
-          serialNumber: '601006Table2OperationName',
-          tableId: "601006Table2",
-          tableName: "标准工序表",
-          columnProp: 'operationName',
-          headerAlign: "center",
-          align: "left",
-          columnLabel: '工序名称',
+          serialNumber: '601006Table2WorkCenterNo',
+          tableId: '601006Table2',
+          tableName: '标准工序表',
+          columnProp: 'setupCrewSize',
+          headerAlign: 'center',
+          align: 'right',
+          columnLabel: '调机过程人数',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
           sortLv: 0,
           status: true,
           fixed: '',
-          columnWidth: 170,
+          columnWidth: 100,
           isVisible: true // 控制显示的属性
         },
         {
@@ -1130,6 +1126,25 @@ export default {
           columnWidth: 170,
           isVisible: true // 控制显示的属性
         },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 601006,
+          serialNumber: '601006Table2LaborClassDesc',
+          tableId: "601006Table2",
+          tableName: "标准工序表",
+          columnProp: 'laborClassNo',
+          headerAlign: "center",
+          align: "left",
+          columnLabel: '人员等级编码',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 100,
+          isVisible: true // 控制显示的属性
+        },
         {
           userId: this.$store.state.user.name,
           functionId: 601006,
@@ -1139,14 +1154,33 @@ export default {
           columnProp: 'laborClassDesc',
           headerAlign: "center",
           align: "left",
-          columnLabel: '人员等级',
+          columnLabel: '人员等级描述',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
           sortLv: 0,
           status: true,
           fixed: '',
-          columnWidth: 80,
+          columnWidth: 100,
+          isVisible: true // 控制显示的属性
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 601006,
+          serialNumber: '601006Table2SetupLaborClassDesc',
+          tableId: "601006Table2",
+          tableName: "标准工序表",
+          columnProp: 'setupLaborClassNo',
+          headerAlign: "center",
+          align: "left",
+          columnLabel: '调机过程中人员等级编码',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 118,
           isVisible: true // 控制显示的属性
         },
         {
@@ -1158,14 +1192,14 @@ export default {
           columnProp: 'setupLaborClassDesc',
           headerAlign: "center",
           align: "left",
-          columnLabel: '调机时人员等级',
+          columnLabel: '调机过程中人员等级描述',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
           sortLv: 0,
           status: true,
           fixed: '',
-          columnWidth: 100,
+          columnWidth: 118,
           isVisible: true // 控制显示的属性
         },
         {
@@ -1190,13 +1224,13 @@ export default {
         {
           userId: this.$store.state.user.name,
           functionId: 601006,
-          serialNumber: '601006Table2LaborCycleTime',
+          serialNumber: '601006Table2MachRunFactor',
           tableId: "601006Table2",
           tableName: "标准工序表",
-          columnProp: 'laborCycleTime',
+          columnProp: 'machRunFactor',
           headerAlign: "center",
           align: "right",
-          columnLabel: '人工处理时间',
+          columnLabel: '机器单位产出',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
@@ -1209,13 +1243,13 @@ export default {
         {
           userId: this.$store.state.user.name,
           functionId: 601006,
-          serialNumber: '601006Table2MachRunFactor',
+          serialNumber: '601006Table2LaborCycleTime',
           tableId: "601006Table2",
           tableName: "标准工序表",
-          columnProp: 'machRunFactor',
+          columnProp: 'laborCycleTime',
           headerAlign: "center",
           align: "right",
-          columnLabel: '机器单位产出',
+          columnLabel: '人工处理时间',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
@@ -1828,16 +1862,23 @@ export default {
       this.searchProductGroupPtmConditionItemProcess()
     },
 
-    searchProductGroupPtmCondition () {
+    searchProductGroupPtmCondition (seqNo) {
       searchProductGroupPtmCondition(this.productGroupCurrentRow).then(({data}) => {
         if (data.code === 0) {
           this.productGroupPtmConditionList = data.rows1
+          this.activeName = 'first'
           // this.productGroupPtmConditionItemList = data.rows2
           // this.productGroupPtmConditionProcessList = data.rows3
         }
-        if (this.productGroupPtmConditionList.length > 0) {
-          this.$refs.conditionTable.setCurrentRow(this.productGroupPtmConditionList[0])
-          this.currentConditionChangeHandle(this.productGroupPtmConditionList[0])
+        let length = this.productGroupPtmConditionList.length;
+        if (length > 0) {
+          if (seqNo) {
+            this.$refs.conditionTable.setCurrentRow(this.productGroupPtmConditionList[length-1])
+            this.currentConditionChangeHandle(this.productGroupPtmConditionList[length-1])
+          } else {
+            this.$refs.conditionTable.setCurrentRow(this.productGroupPtmConditionList[0])
+            this.currentConditionChangeHandle(this.productGroupPtmConditionList[0])
+          }
         } else {
           this.productGroupPtmConditionItemList = []
           this.productGroupPtmConditionProcessList = []
@@ -1912,7 +1953,7 @@ export default {
             duration: 1500,
             onClose: () => {}
           })
-          this.searchProductGroupPtmCondition()
+          this.searchProductGroupPtmCondition(tempData.seqNo)
           this.ptmSaveFlag = false
         } else {
           this.$alert(data.msg, '错误', {
@@ -2050,7 +2091,11 @@ export default {
       // 人工处理时间赋值
       row.laborCycleTime = row.machCycleTime
       // 计算机器单位产出
-      row.machRunFactor = 1/row.machCycleTime
+      if (row.machCycleTime !== 0 && row.machCycleTime !== '0') {
+        row.machRunFactor = (1 / row.machCycleTime).toFixed(2)
+      }else {
+        row.machRunFactor = 0
+      }
       // 人工单位产出赋值
       row.laborRunFactor = row.machRunFactor
     },
@@ -2058,7 +2103,11 @@ export default {
     // 人工处理时间改变
     changeLaborCycleTime (row) {
       // 计算人工单位产出
-      row.laborRunFactor = 1/row.laborCycleTime
+      if (row.laborCycleTime === 0 || row.laborCycleTime === '0') {
+        row.laborRunFactor = 0
+      } else {
+        row.laborRunFactor = (1/row.laborCycleTime).toFixed(2)
+      }
     },
 
     // 属性输入校验
diff --git a/src/views/modules/part/standardRoutingOperation.vue b/src/views/modules/part/standardRoutingOperation.vue
index 1f084b9..7c91c5b 100644
--- a/src/views/modules/part/standardRoutingOperation.vue
+++ b/src/views/modules/part/standardRoutingOperation.vue
@@ -396,7 +396,7 @@ export default {
           sortLv: 0,
           status: true,
           fixed: '',
-          columnWidth: 100
+          columnWidth: 118
         },
         {
           userId: this.$store.state.user.name,