diff --git a/src/utils/request.js b/src/utils/request.js
index fc41e22d..2cb92ad8 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -26,7 +26,7 @@ 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({
-  baseURL: `http://192.168.1.231:8411/submit/MESCommonBase.ashx`,
+  baseURL: `http://192.168.0.110:8002/submit/MESCommonBase.ashx`,
   timeout: 1500000 // 请求超时时间
 })
 export default service
diff --git a/src/views/ManufacturingCenter/ProcessPlanningNew/index.vue b/src/views/ManufacturingCenter/ProcessPlanningNew/index.vue
index a4a40f3d..c37d106b 100644
--- a/src/views/ManufacturingCenter/ProcessPlanningNew/index.vue
+++ b/src/views/ManufacturingCenter/ProcessPlanningNew/index.vue
@@ -64,7 +64,7 @@
             </el-select>
           </el-col>
 
-          <el-col v-show="materielValue==='1'||materielValue==='6'||materielValue==='7'||materielValue==='8'" :span="12" style="width: 60%">
+          <el-col v-show="materielValue==='1'||materielValue==='6'||materielValue==='7'||materielValue==='8'" :span="12">
             <span >直&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;径:</span>
             <el-input-number v-model="diameter" size="small" controls-position="right" style="width:100px;margin-top: 7px"/>
             <span>长度:</span>
@@ -74,7 +74,7 @@
             <el-input v-model="weight" style="width:150px" size="small" placeholder="重量">
               <el-button slot="append" icon="el-icon-cjn-09" @click="saveWeight"/>
             </el-input>
-            <el-button style="margin-left: 10px;" type="success" size="small" @click="insertThestring()">合并生产</el-button>
+            <!--<el-button style="margin-left: 10px;" type="success" size="small" @click="insertThestring()">合并生产</el-button>-->
           </el-col>
 
           <el-col v-show="materielValue==='2'||materielValue==='9'||materielValue==='10'||materielValue==='11'" :span="20">
@@ -195,7 +195,7 @@
     </el-card>
     <el-card>
       <el-row>
-        <el-col style="width: 180px;height: 683px;overflow: auto">
+        <el-col :span="4" style="height: 683px;overflow: auto">
           <el-tree
             :data="departmentData"
             :props="defaultProps"
@@ -205,8 +205,8 @@
             default-expand-all
             @node-click="onClick"/>
         </el-col>
-        <el-col style="width: 970px;height: 700px">
-          <el-table v-loading="loading0" :data="tableData" class="processTable" border style="width: 967px" height="683px" size="mini">
+        <el-col :span="20" style="height: 700px">
+          <el-table v-loading="loading0" :data="tableData" class="processTable" border style="width: 100%" height="683px" size="mini">
             <el-table-column prop="num" label="序号" width="45" align="center" type="index"/>
             <el-table-column prop="name" label="工艺名称" width="180" align="center">
               <template slot-scope="scope">
@@ -223,13 +223,15 @@
                 <el-input v-direction="{x: 1, y: scope.$index}" v-model="scope.row.准结定额工时" style="width:100%" placeholder="" @change="readyChange(scope.row)"/>
               </template>
             </el-table-column>
-            <el-table-column prop="request" label="工艺要求" align="center" width="290">
+            <el-table-column prop="request" label="工艺要求" align="center">
               <template slot-scope="scope">
                 <el-input
                   v-direction="{x: 2, y: scope.$index}"
                   v-model="scope.row.工艺要求"
+                  :rows="1"
                   :fetch-suggestions="querySearch"
                   placeholder=""
+                  type="textarea"
                   style="width: 100%"
                   @focus="focusRequest(scope.row)"
                   @blur="blurRequest(scope.row)"