diff --git a/src/views/productplan/workbench/order.vue b/src/views/productplan/workbench/order.vue
index da56a98..5de4ec7 100644
--- a/src/views/productplan/workbench/order.vue
+++ b/src/views/productplan/workbench/order.vue
@@ -90,16 +90,7 @@
 					<div v-else-if="item === 'OM_WorkOrder-ActStartTime'"> {{ parseTime(scope.row[item]) }} </div>
 					<div v-else-if="item === 'OM_WorkOrder-ActEndTime'"> {{ parseTime(scope.row[item]) }} </div>
 					<div v-else-if="item === 'OM_WorkOrderStatus-Status'" 
-						:class="['bg-div',{'not-plan-bg':scope.row[item] == 10},
-						{'has-plan-bg':scope.row[item] == 20},
-						{'has-lock-bg':scope.row[item] == 24},
-						{'has-issued-bg':scope.row[item] == 26},
-						{'interrupt-bg':scope.row[item] == 39},
-						{'in-production-bg':scope.row[item] == 40},
-						{'has-complete-bg':scope.row[item] == 80},
-						{'has-shipment-bg':scope.row[item] == 90},
-						{'freeze-bg': scope.row[item] == 95},
-						{'has-cancel-bg': scope.row[item] == 98}]"> {{ fieldTrans(scope.row[item]) }} </div>
+						:class="[colorData[scope.row[item]], 'bg-div']"> {{ fieldTrans(scope.row[item]) }} </div>
 					<div v-else-if="item === 'OM_WorkOrder-OrderType'"> {{ orderTypeTrans(scope.row[item]) }} </div>
           <span v-else>{{ scope.row[item] }}</span>
         </template>
@@ -297,16 +288,9 @@
 				<el-table-column v-for="(item, index) in detailsHeaders" :key="index+'aaa'" :label="getColumnName(item)" :show-overflow-tooltip="true" align="center">
 					<template slot-scope="scope">
 						<div v-if="item === 'OM_SerialOrder-SerialOrderStatus'"
-						:class="['bg-div',{'not-plan-bg':scope.row[item]['OM_SerialOrderStatus-Status'] == 10},
-						{'has-plan-bg':scope.row[item]['OM_SerialOrderStatus-Status'] == 20},
-						{'has-lock-bg':scope.row[item]['OM_SerialOrderStatus-Status'] == 24},
-						{'has-issued-bg':scope.row[item]['OM_SerialOrderStatus-Status'] == 26},
-						{'interrupt-bg':scope.row[item]['OM_SerialOrderStatus-Status'] == 39},
-						{'in-production-bg':scope.row[item]['OM_SerialOrderStatus-Status'] == 40},
-						{'has-complete-bg':scope.row[item]['OM_SerialOrderStatus-Status'] == 80},
-						{'has-shipment-bg':scope.row[item]['OM_SerialOrderStatus-Status'] == 90},
-						{'freeze-bg': scope.row[item]['OM_SerialOrderStatus-Status'] == 95},
-						{'has-cancel-bg': scope.row[item]['OM_SerialOrderStatus-Status'] == 98}]"> {{ fieldTrans(scope.row[item]['OM_SerialOrderStatus-Status']) }} </div>
+							:class="[colorData[scope.row[item]['OM_SerialOrderStatus-Status']], 'bg-div']"> 
+							{{ fieldTrans(scope.row[item]['OM_SerialOrderStatus-Status']) }} 
+						</div>
 						<span v-else>{{ scope.row[item] }}</span>
 					</template>
 				</el-table-column>
@@ -422,6 +406,18 @@ export default {
 			detailsHeaders: [],
 			detailsTimeHeaders: [],
 			detailsLoading: true,
+			colorData:{
+        10:'not-plan-bg',
+        20:'has-plan-bg',
+        24:'has-lock-bg',
+        26:'has-issued-bg',
+        39:'interrupt-bg',
+        40:'in-production-bg',
+        80:'has-complete-bg',
+        90:'has-shipment-bg',
+        95:'freeze-bg',
+        98:'has-cancel-bg',
+      }
     }
   },
   created() {
diff --git a/src/views/quality/component/shipmentList.vue b/src/views/quality/component/shipmentList.vue
index dfdab1f..30fde34 100644
--- a/src/views/quality/component/shipmentList.vue
+++ b/src/views/quality/component/shipmentList.vue
@@ -18,15 +18,18 @@
 				border
 				height="100%"
 				>
-				<el-table-column type="index" label="位置" width="50"></el-table-column>
-				<el-table-column prop="JIT_ShipOrderItemlst-ItemId" label="零件号" show-overflow-tooltip></el-table-column>
-				<!-- <el-table-column prop="JIT_ShipOrderItemlst-ProjectId" label="项目号" show-overflow-tooltip></el-table-column> -->
-				<el-table-column prop="JIT_ShipOrderItemlst-Descr" label="描述" show-overflow-tooltip></el-table-column>
-				<!-- <el-table-column prop="date" label="标包" show-overflow-tooltip></el-table-column>
-				<el-table-column prop="name" label="需求包装数" show-overflow-tooltip></el-table-column> -->
-				<el-table-column prop="JIT_ShipOrderItemlst-PlanQty" label="计划数量" show-overflow-tooltip></el-table-column>
-				<el-table-column prop="JIT_ShipOrderItemlst-ActualQty" label="实际数量" show-overflow-tooltip></el-table-column>
-				<el-table-column prop="JIT_ShipOrderItemlst-Status" label="状态" show-overflow-tooltip></el-table-column>
+				<el-table-column type="index" label="位置" align="center"></el-table-column>
+				<el-table-column prop="JIT_ShipOrderItemlst-ItemId" align="center" label="零件号" show-overflow-tooltip></el-table-column>
+				<el-table-column prop="JIT_ShipOrderItemlst-Descr" align="center" label="描述" show-overflow-tooltip></el-table-column>
+				<el-table-column prop="JIT_ShipOrderItemlst-PlanQty" align="center" label="计划数量" show-overflow-tooltip></el-table-column>
+				<el-table-column prop="JIT_ShipOrderItemlst-ActualQty" align="center" label="实际数量" show-overflow-tooltip></el-table-column>
+				<el-table-column prop="JIT_ShipOrderItemlst-Status" align="center" label="状态" show-overflow-tooltip>
+					<template slot-scope="scope">
+						<div :class="[colorData[scope.row['JIT_ShipOrderItemlst-Status']], 'bg-div']">
+							{{ fieldTrans(scope.row['JIT_ShipOrderItemlst-Status']) }}
+						</div>
+					</template>
+				</el-table-column>
 			</el-table>
 		</div>
 	</div>
@@ -45,8 +48,27 @@ export default {
 			tableData: [],
 			loading: false,
 			dataObj: {},
+			orderStatusArray: [],
+			colorData:{
+        10:'not-plan-bg',
+        20:'has-plan-bg',
+        24:'has-lock-bg',
+        26:'has-issued-bg',
+        39:'interrupt-bg',
+        40:'in-production-bg',
+        80:'has-complete-bg',
+        90:'has-shipment-bg',
+        95:'freeze-bg',
+        98:'has-cancel-bg',
+      }
     }
   },
+	created() {
+		// 订单生产状态
+		this.getStanderOne({ statid: 'shipStatus' }).then(res => {
+			this.orderStatusArray = res.data
+		})
+	},
 	methods: {
 		getInfo(orderId) {
 			getShiporderDetail(orderId).then(({code, data}) => {
@@ -55,6 +77,18 @@ export default {
 				}
 			})
 		},
+		// 订单状态字段转换
+		fieldTrans(value) {
+			if (this.orderStatusArray.length > 0) {
+				let fieldValue = ''
+				this.orderStatusArray.forEach(el => {
+					if (value === Number(el['stdeftab-stdeftyp'])) {
+						fieldValue = el['stdeftab-bez']
+					}
+				})
+				return fieldValue
+			}
+		},
 	},
 	watch: {
     shipOrderId: {
@@ -70,6 +104,10 @@ export default {
 <style lang="scss" scoped>
 .shipment-list-wrap {
 	height: 100%;
+	.bg-div {
+		height: 30px;
+		line-height: 30px;
+	}
 	.shipment-list-info {
 		max-height: 68px;
 		padding: 10px;
diff --git a/src/views/system/args/stdeftab.vue b/src/views/system/args/stdeftab.vue
index 8fb556e..da3cab4 100644
--- a/src/views/system/args/stdeftab.vue
+++ b/src/views/system/args/stdeftab.vue
@@ -61,9 +61,9 @@
     <!-- 添加或修改角色配置对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="640px" :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
-        <el-col v-if="isAdd" :span="12">
+        <el-col :span="12">
           <el-form-item :label="getColumnName('stdeftab-finr')" prop="stdeftab-finr">
-            <el-select v-model="form['stdeftab-finr']" placeholder="请选择车间">
+            <el-select v-model="form['stdeftab-finr']" :disabled="!isAdd" placeholder="请选择车间">
               <el-option
                 v-for="item in options"
                 :key="item.pid"
@@ -73,23 +73,23 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col v-if="isAdd" :span="12">
-          <el-form-item :label="getColumnName('stdeftab-statid')" prop="stdeftab-statid">
-            <el-input v-model="form['stdeftab-statid']" placeholder="请输入" />
+        <el-col :span="12">
+          <el-form-item label="类型" prop="stdeftab-statid">
+            <el-input :disabled="!isAdd" v-model="form['stdeftab-statid']" placeholder="请输入" />
           </el-form-item>
         </el-col>
-        <el-col v-if="isAdd" :span="12">
-          <el-form-item :label="getColumnName('stdeftab-stdeftyp')" prop="stdeftab-stdeftyp">
-            <el-input v-model="form['stdeftab-stdeftyp']" placeholder="请输入" />
+        <el-col :span="12">
+          <el-form-item label="值" prop="stdeftab-stdeftyp">
+            <el-input :disabled="!isAdd" v-model="form['stdeftab-stdeftyp']" placeholder="请输入" />
           </el-form-item>
         </el-col>
-        <el-col v-if="isAdd" :span="12">
-          <el-form-item :label="getColumnName('stdeftab-lang')" prop="stdeftab-lang">
-            <el-input v-model="form['stdeftab-lang']" placeholder="请输入" />
+        <el-col :span="12">
+          <el-form-item label="语言" prop="stdeftab-lang">
+            <el-input :disabled="!isAdd" v-model="form['stdeftab-lang']" placeholder="请输入" />
           </el-form-item>
         </el-col>
         <el-col :span="24">
-          <el-form-item :label="getColumnName('stdeftab-bez')">
+          <el-form-item :label="getColumnName('stdeftab-bez')" prop="stdeftab-bez">
             <el-input v-model="form['stdeftab-bez']" placeholder="请输入" />
           </el-form-item>
         </el-col>
@@ -145,7 +145,10 @@ export default {
         ],
         'stdeftab-lang': [
           { required: true, message: '此项不能为空', trigger: 'blur' }
-        ]
+        ],
+				'stdeftab-bez': [
+          { required: true, message: '此项不能为空', trigger: 'blur' }
+        ],
       }
     }
   },