Merge remote-tracking branch 'origin/master'

ys_vue/src/views/mold/moldDownload.vue

@@ -44,35 +44,35 @@
             <router-link :to="'/moldList/' + scope.row.id" tag="span" style="color: #409eff;cursor: pointer;">{{scope.row.modelName}}</router-link>
         </template>
       </el-table-column>
-      <el-table-column width="200" label="模具3D图档">
+      <el-table-column width="250" label="模具3D图档">
         <template slot-scope="scope">
           <span v-if="scope.row.mould3DFiles.length == 0">未上传</span>
           <span v-else-if="scope.row.mould3DFilesState">已通过</span>
           <span v-else>未通过</span>
         </template>
       </el-table-column>
-      <el-table-column width="200" label="模具2D图档">
+      <el-table-column width="250" label="模具2D图档">
         <template slot-scope="scope">
           <span v-if="scope.row.mould2DFiles.length == 0">未上传</span>
           <span v-else-if="scope.row.mould2DFilesState">已通过</span>
           <span v-else>未通过</span>
         </template>
       </el-table-column>
-      <el-table-column width="200" label="零件3D图档">
+      <el-table-column width="250" label="零件3D图档">
         <template slot-scope="scope">
           <span v-if="scope.row.sparepart3DFiles.length == 0">未上传</span>
           <span v-else-if="scope.row.sparepart3DFilesState">已通过</span>
           <span v-else>未通过</span>
         </template>
       </el-table-column>
-      <el-table-column width="200" label="零件2D图档">
+      <el-table-column width="250" label="零件2D图档">
         <template slot-scope="scope">
           <span v-if="scope.row.sparepart2DFiles.length == 0">未上传</span>
           <span v-else-if="scope.row.sparepart2DFilesState">已通过</span>
           <span v-else>未通过</span>
         </template>
       </el-table-column>
-      <el-table-column width="200" label="保养方案">
+      <el-table-column width="250" label="保养方案">
         <template slot-scope="scope">
           <span v-if="scope.row.maintainFiles.length == 0">未上传</span>
           <span v-else-if="scope.row.maintainFilesState">已通过</span>
@@ -218,10 +218,10 @@ export default {
             res => {
                 this.listLoading = false;
                 if (res.code == "ok") {
-                    // let a = document.createElement('a')
-                    // a.setAttribute('download', res.data.splice("/")[2]);
-                    // a.setAttribute("href", res.data);
-                    // a.click();
+                    let a = document.createElement('a')
+                    a.setAttribute('download', res.data.split("/")[2]);
+                    a.setAttribute("href", res.data);
+                    a.click();
                 } else {
                     this.$message({
                         message: res.msg,

ys_vue/src/views/project/projectDetail.vue

@@ -534,7 +534,8 @@
                 }
                 this.http.post(this.port.project.getUserById, {
                     companyIds: compIds,
-                    id: this.user.id
+                    id: this.user.id,
+                    projectId: this.detailId
                 } , res => {
                     if (res.code == "ok") {
                         var list = res.data , assets = [] , produce = [];
@@ -613,7 +614,8 @@
                     str += "," + this.editForm.modelIds[i].produceCompanyId;
                 }
                 param.companyIds = str;
-                param.id = this.user.id
+                param.id = this.user.id;
+                param.projectId = this.detailId;
                 this.http.post(this.port.project.getUserById, param , res => {
                     if (res.code == "ok") {
                         var list = res.data , assets = [] , produce = [];