Merge branch 'master' of http://47.100.37.243:10080/ZHOU/yunsu

ys_vue/src/port.js

@@ -56,7 +56,7 @@ export default {
         exportOperationExcel: '/mouldfile/downloadFileListExcel', //下载操作记录
 
         moldFileDelete: '/mouldfile/delFile', //项目文档的删除
-        moldOperationList: '/mouldoperationdynamics/list', //项目文档的删除
+        moldOperationList: '/mouldoperationdynamics/list', //项目操作记录列表
 
         partList: '/part/list', //零件列表
         addPart: '/part/addOrUpdate', //单个零件添加

ys_vue/src/views/mold/moldDetail.vue

@@ -353,7 +353,7 @@
                                 <el-button size="small" @click="checkUpdate(scope.row.id, false)" type="danger"
                                     v-if="approve == 1 && (scope.row.state == 0 || (scope.row.state == 1 && user.subordinateType == 1) || (scope.row.state == 2 && user.subordinateType == 0))" 
                                     >不通过</el-button>
-                                <el-button size="small" @click="showAdd" type="primary"
+                                <el-button size="small" @click="showAdd(scope.row.id)" type="primary"
                                     v-if="scope.row.uplodtorId == user.id && scope.row.state == 3">更新模具</el-button>
                             </template>
                         </el-table-column>
@@ -426,22 +426,26 @@
         </el-dialog>
 
         <!-- 模具报废上传弹窗 -->
-        <el-dialog title="模具报废上传" :visible.sync="centerDialog2Visible" width="100" :before-close="clearFileRecord" center>
-            <p>申请单</p>
-            <el-upload ref="upload1" action="customize" :http-request="uploadFile" :limit="1" :auto-upload="false">
-                <el-button size="small" type="primary">上传</el-button>
-            </el-upload>
-            <p>报废单</p>
-            <el-upload ref="upload2" action="customize" :http-request="uploadFile" :limit="1" :auto-upload="false">
-                <el-button size="small" type="primary">上传</el-button>
-            </el-upload>
+        <el-dialog title="模具报废上传" :visible.sync="centerDialog2Visible" width="450px" :before-close="clearFileRecord">
+            <p style="height:60px;">
+                <span style="float:left;margin-right:30px;">申请单</span>
+                <el-upload ref="upload1" action="customize" :http-request="uploadFile" :limit="1" :auto-upload="false" style="float:left">
+                    <el-button size="small" type="primary">上传</el-button>
+                </el-upload>
+            </p>
+            <p style="height:60px;">
+                <span style="float:left;margin-right:30px;">报废单</span>
+                <el-upload ref="upload2" action="customize" :http-request="uploadFile" :limit="1" :auto-upload="false" style="float:left">
+                    <el-button size="small" type="primary">上传</el-button>
+                </el-upload>
+            </p>
             <span slot="footer" class="dialog-footer">
                 <el-button @click="confirmUpload" :loading="uploading[3]">确定</el-button>
             </span>
         </el-dialog>
 
         <!-- 零件文档上传弹窗 -->
-        <el-dialog title="零件文档上传" v-if="centerDialog4Visible" :visible.sync="centerDialog4Visible" width="100" :before-close="clearFileRecord2" center>
+        <el-dialog title="零件文档上传" v-if="centerDialog4Visible" :visible.sync="centerDialog4Visible" width="450px" :before-close="clearFileRecord2">
             <p style="color:#ccc;">文件命名规则：零件编号+2D/3D  如 LJ001+2D.dwg</p>
             <el-upload ref="upload4" action="uploadFile" :http-request="uploadPartFile" :show-file-list="true" :before-remove="beforeRemove" multiple>
                 <el-button size="small" type="primary" :loading="uploading[2]">上传</el-button>
@@ -452,7 +456,7 @@
         </el-dialog>
 
         <!-- 批量导出操作记录弹窗 -->
-        <el-dialog title="批量导出操作记录" v-if="centerDialog5Visible" :visible.sync="centerDialog5Visible" width="100" center>
+        <el-dialog title="批量导出操作记录" v-if="centerDialog5Visible" :visible.sync="centerDialog5Visible" width="450px">
             <!-- <span style="line-height: 40px;">请选择需要导出的时间段：</span> -->
             <div style="text-align:center;">
                 <el-date-picker v-model="recordTime" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
@@ -1361,9 +1365,10 @@
             },
 
             //更新弹框
-            showAdd() {
+            showAdd(id) {
                 this.addFormVisible = true;
                 this.addForm = {
+                    dynamicId: id,
                     modelName: "",
                     initialModulus: "",
                     settingLife: "",
@@ -1397,7 +1402,9 @@
                                     message: "更新成功",
                                     type: "success"
                                 });
-                                this.$router.push("/moldList");
+                                this.$router.push("/moldList/" + res.data.id );
+                                this.detailId = res.data.id;
+                                this.getDetail();
                             } else {
                                 this.$message({
                                     message: res.msg,