diff --git a/src/utils/request.js b/src/utils/request.js
index 20b60b1b..4112ffa0 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -26,8 +26,12 @@ export const downloadFileMachine = `http://192.168.1.231:8411/submit/downloadFil
 export const MESUploadFile = `http://192.168.1.231:8411/submit/MESUploadFile.ashx`
 export const MESDownloadFile = `http://192.168.1.231:8411/submit/MESDownloadFile.ashx`
 const service = axios.create({
+<<<<<<< HEAD
 
   baseURL: `http://192.168.0.100:8074/submit/MESCommonBase.ashx`,
+=======
+  baseURL: `http://192.168.1.231:8411/submit/MESCommonBase.ashx`,
+>>>>>>> 4fb54f4d3ea13e7c327b17bde7ac4ffc21b9b821
   timeout: 1500000 // 请求超时时间
 })
 export default service
diff --git a/src/views/ManufacturingCenter/CompletionOfWorkshopComponents/index.vue b/src/views/ManufacturingCenter/CompletionOfWorkshopComponents/index.vue
index 9578cbec..1274075e 100644
--- a/src/views/ManufacturingCenter/CompletionOfWorkshopComponents/index.vue
+++ b/src/views/ManufacturingCenter/CompletionOfWorkshopComponents/index.vue
@@ -30,7 +30,8 @@
             </el-table-column>
             <el-table-column align="center" label="操作者" width="100">
               <template slot-scope="scope">
-                {{ scope.row.员工姓名 === '超级管理员' && scope.row.工序状态 !== 4 ? '' : scope.row.员工姓名 }}
+                <!--{{ scope.row.员工姓名 === '超级管理员' && scope.row.工序状态 !== 4 ? '' : scope.row.员工姓名 }}-->
+                {{ scope.row.工序间是否外协 === 2 ? '外协' : (scope.row.员工姓名 === '超级管理员' && scope.row.工序状态 !== 4 ? '' : scope.row.员工姓名) }}
               </template>
             </el-table-column>
             <el-table-column align="center" label="数量" show-overflow-tooltip min-width="90">