diff --git a/.env.production b/.env.production
index 27e4fe17..0426983e 100644
--- a/.env.production
+++ b/.env.production
@@ -1,5 +1,5 @@
 # 页面标题
-VUE_APP_TITLE = Open Platform
+VUE_APP_TITLE = 榄菊生产管理系统
 
 # 生产环境配置
 ENV = 'production'
diff --git a/src/components/FileUpload/index.vue b/src/components/FileUpload/index.vue
index 8be095c9..1e1534ec 100644
--- a/src/components/FileUpload/index.vue
+++ b/src/components/FileUpload/index.vue
@@ -60,7 +60,7 @@ export default {
     // 文件类型, 例如['png', 'jpg', 'jpeg']
     fileType: {
       type: Array,
-      default: () => ["doc", "xls", "ppt", "txt", "pdf",'png', 'jpg', 'jpeg'],
+      default: () => ["doc", "xls", "docx", "xlsx","ppt", "txt", "pdf",'png', 'jpg', 'jpeg'],
     },
     // 是否显示提示
     isShowTip: {
@@ -163,7 +163,6 @@ export default {
     },
     // 上传结束处理
     uploadedSuccessfully() {
-      debugger
       if (this.number > 0 && this.uploadList.length === this.number) {
         this.fileList = this.fileList.concat(this.uploadList);
         this.uploadList = [];
@@ -174,10 +173,10 @@ export default {
     },
     // 获取文件名称
     getFileName(name) {
-      if (name.lastIndexOf("/") > -1) {
-        return name.slice(name.lastIndexOf("/") + 1);
+      if (name.lastIndexOf("&") > -1) {
+        return name.slice(name.lastIndexOf("&") + 1);
       } else {
-        return "";
+        return name;
       }
     },
     // 对象转成指定字符串分隔
diff --git a/src/views/mes/pro/process/content.vue b/src/views/mes/pro/process/content.vue
index e13f66a8..9c6ea327 100644
--- a/src/views/mes/pro/process/content.vue
+++ b/src/views/mes/pro/process/content.vue
@@ -252,6 +252,7 @@ export default {
     },
     /** 提交按钮 */
     submitForm() {
+      debugger
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.contentId != null) {
diff --git a/src/views/mes/pro/process/index.vue b/src/views/mes/pro/process/index.vue
index 6ec6ab4d..67d4582e 100644
--- a/src/views/mes/pro/process/index.vue
+++ b/src/views/mes/pro/process/index.vue
@@ -89,6 +89,14 @@
         </template>
       </el-table-column>
       <el-table-column label="工序名称" align="center" prop="processName" :show-overflow-tooltip="true"/>
+      <el-table-column label="拆分&合并" align="center" prop="splitMerge">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.split_merge" :value="scope.row.splitMerge"/>
+        </template>
+      </el-table-column>
+      <!--<el-table-column label="拆合值" align="center" prop="splitMergNum" :show-overflow-tooltip="true"/>-->
+      <el-table-column label="工作中心" align="center" prop="workCenter" :show-overflow-tooltip="true"/>
+      <el-table-column label="工作时长" align="center" prop="workTime" :show-overflow-tooltip="true"/>
       <el-table-column label="是否启用" align="center" prop="enableFlag">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.enableFlag"/>
@@ -159,7 +167,7 @@
         </el-row>
         <el-row>
           <el-col :span="8">
-            <el-form-item label="拆分&合并">
+            <el-form-item label="拆分&合并"  prop="splitMerge">
               <el-select v-model="form.splitMerge" placeholder="请选择">
                 <el-option
                   v-for="dict in dict.type.split_merge"
@@ -170,12 +178,12 @@
               </el-select>
             </el-form-item>
           </el-col>
-          
+          <!--
           <el-col :span="7">
-            <el-form-item label="工序名称" prop="splitMergeNum">
+            <el-form-item label="拆合值" prop="splitMergeNum">
               <el-input v-model="form.splitMergeNum" placeholder="请输入拆分&合并数量" />
             </el-form-item>
-          </el-col>
+          </el-col>-->
           <el-col :span="6">
             <el-form-item label="可多单运行" prop="sync">
                <el-radio-group v-model="form.sync" disabled v-if="optType=='view'">
@@ -296,9 +304,6 @@ export default {
         splitMerge: [
           { required: true, message: "拆分&合并不能为空", trigger: "blur" }
         ],
-        splitMergeNum: [
-          { required: true, message: "拆分&合并数量不能为空", trigger: "blur" }
-        ],
         sync: [
           { required: true, message: "可多单运行不能为空", trigger: "blur" }
         ],
@@ -337,7 +342,7 @@ export default {
         createTime: null,
         updateBy: null,
         updateTime: null,
-        fileList:[]
+        fileList:''
       };
       this.autoGenFlag = false;
       this.resetForm("form");
@@ -382,6 +387,16 @@ export default {
       const processId = row.processId || this.ids
       getProcess(processId).then(response => {
         this.form = response.data;
+        if(response.data.files != null){
+          var newFiles = [];
+          response.data.files.forEach(item =>{
+              var newfile = {};
+              newfile.name = item.fileName;
+              newfile.url = item.fileAddress;
+              newFiles.push(newfile);
+          })
+          this.form.fileList = newFiles;
+        }
         this.open = true;
         this.title = "修改生产工序";
         this.optType = "edit";