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

ys_vue/src/port.js

@@ -60,7 +60,8 @@ export default {
 
         moldMaintain: '/mouldmaintain/maintain', //维护
         moldMaintainList: '/mouldmaintain/list', //获取列表
-        moldMaintainListGet: '/mould/maintainMouldList' //主页获取模具列表*
+        moldMaintainListGet: '/mould/maintainMouldList', //主页获取保养模具列表
+        moldDiscardListGet: '/mould/scrapMouldList' //主页获取报废模具列表
     },
     //基础管理
     base: {

ys_vue/src/views/Home.vue

@@ -332,8 +332,35 @@ export default {
         this.$router.push("/detection/" + id);
       }
     },
-    //检查是否要进行提示
-    checkNotice() {
+    //检查是否要进行报废提示
+    checkDiscardNotice() {
+      this.http.post(
+        this.port.mold.moldDiscardListGet,
+        {},
+        res => {
+          if (res.code == "ok") {
+            //说明有东西需要保养
+            if (res.data.length > 0) {
+              this.notify("报废");
+            }
+          } else {
+            this.$message({
+              message: res.msg,
+              type: "error"
+            });
+          }
+        },
+        error => {
+          this.editLoading = false;
+          this.$message({
+            message: error,
+            type: "error"
+          });
+        }
+      );
+    },
+    //检查是否要进行保养提示
+    checkMaintainNotice() {
       this.http.post(
         this.port.mold.moldMaintainListGet,
         {},
@@ -341,7 +368,7 @@ export default {
           if (res.code == "ok") {
             //说明有东西需要保养
             if (res.data.length > 0) {
-              this.notify();
+              this.notify("保养");
             }
           } else {
             this.$message({
@@ -360,9 +387,9 @@ export default {
       );
     },
     //右上角弹窗警告
-    notify() {
+    notify(action) {
       this.$notify({
-        title: "有模具需要保养",
+        title: "有模具需要" + action,
         message: "请到消息列表中查看",
         type: "warning",
         duration: 0
@@ -370,8 +397,9 @@ export default {
     }
   },
   mounted() {
-    //检查是否需要进行提示
-    this.checkNotice();
+    //告警 保养的烦人弹窗警告 先不弹出了
+    // this.checkMaintainNotice();
+    // this.checkDiscardNotice();
     if (this.user) {
       var user = JSON.parse(this.user);
       this.user = user;

ys_vue/src/views/detection/detection.vue

@@ -22,35 +22,39 @@
 
     <!--列表-->
     <el-table
-        :data="moulds"
-        :height="tableHeight"
-        highlight-current-row
-        v-loading="listLoading"
-        style="width: 100%;"
+      :data="moulds"
+      :height="tableHeight"
+      highlight-current-row
+      v-loading="listLoading"
+      style="width: 100%;"
     >
-        <el-table-column type="index" width="60"></el-table-column>
-        <el-table-column prop="modelNo" label="模具编号" width="100" sortable></el-table-column>
-        <el-table-column label="模具名称" width="200" sortable>
-            <template slot-scope="scope">
-                <a style="color: #409EFF; cursor: pointer" @click="toMaintenance(scope.row.id)">
-                    {{scope.row.modelName}}
-                </a>
-            </template>
-        </el-table-column>
-        <el-table-column prop="equipmentNo" label="云模盒编号" width="120" sortable></el-table-column>
-        <el-table-column prop="projectName" label="所属项目" width="200" sortable></el-table-column>
-        <el-table-column prop="factoryName" label="制造工厂" width="200" sortable></el-table-column>
-        <el-table-column prop="area" label="位置" width="200" sortable></el-table-column>
-        <el-table-column prop="runTimes" label="运行次数" align="center" width="100" sortable></el-table-column>
-        <el-table-column prop="ocCycle" label="每模平均周期" align="center" width="140" sortable></el-table-column>
-        <el-table-column prop="hillNumber" label="电量" align="center" width="80" sortable></el-table-column>
-        <el-table-column prop="state" label="当前状态" align="center" width="100" sortable></el-table-column>
-        <el-table-column label="模具保养" align="center" fixed="right" width="100">
-            <template slot-scope="scope">
-                <span v-if="scope.row.isMaintain == 1">需要</span>
-                <span v-else>不需要</span>
-            </template>
-        </el-table-column>
+      <el-table-column type="index" width="60"></el-table-column>
+      <el-table-column prop="modelNo" label="模具编号" width="100" sortable></el-table-column>
+      <el-table-column label="模具名称" width="200" sortable>
+        <template slot-scope="scope">
+          <a
+            style="color: #409EFF; cursor: pointer"
+            @click="toMould(scope.row.id)"
+          >{{scope.row.modelName}}</a>
+        </template>
+      </el-table-column>
+      <el-table-column prop="equipmentNo" label="云模盒编号" width="120" sortable></el-table-column>
+      <el-table-column prop="projectName" label="所属项目" width="200" sortable></el-table-column>
+      <el-table-column prop="factoryName" label="制造工厂" width="200" sortable></el-table-column>
+      <el-table-column prop="area" label="位置" width="200" sortable></el-table-column>
+      <el-table-column prop="runTimes" label="运行次数" align="center" width="100" sortable></el-table-column>
+      <el-table-column prop="ocCycle" label="每模平均周期" align="center" width="140" sortable></el-table-column>
+      <el-table-column prop="hillNumber" label="电量" align="center" width="80" sortable></el-table-column>
+      <el-table-column prop="state" label="当前状态" align="center" width="100" sortable></el-table-column>
+      <el-table-column label="云模盒报警N/A" align="center" fixed="right" width="160">低电量、温度过高</el-table-column>
+      <el-table-column label="模具保养" align="center" fixed="right" width="100">
+        <template slot-scope="scope">
+          <a style="color: #409EFF; cursor: pointer" @click="toMaintenance(scope.row.id)">
+            <span v-if="scope.row.isMaintain == 1">需要</span>
+            <span v-else>正常</span>
+          </a>
+        </template>
+      </el-table-column>
     </el-table>
 
     <!--工具条-->
@@ -95,9 +99,15 @@ export default {
       this.size = val;
       this.getMoulds();
     },
+    //跳转到运行监测详情
     toMaintenance(id) {
       this.$router.push("/detection/" + id);
     },
+    //跳转到模具详情
+    toMould(id) {
+      this.$router.push("/moldList/" + id);
+    },
+    //获取模具信息
     getMoulds(keyWord) {
       this.listLoading = true;
       if (keyWord == null) {

ys_vue/src/views/detection/maintenance.vue

@@ -12,23 +12,35 @@
           保养提醒：
           <el-switch v-model="prompt" active-color="#ff4949"></el-switch>
         </el-form-item>-->
-        <el-form-item style="float: right">
-          当前保养状态：
-          <span v-if="requirement" style="color: #ff4949; margin-right: 16px;">需要</span>
-          <span v-else style="color: black; margin-right: 16px;">不需要</span>
-          <el-button size="small" type="primary" v-if="requirement" @click="showMaintenance">立即处理</el-button>
+
+        <el-form-item class="state" style="float: right;">
+          当前状态：
+          <span v-if="mouldState == 0">静止</span>
+          <span v-else-if="mouldState == 1">运行</span>
+          <!-- 因为目前还不知道mouldState的意义 -->
+          <span v-else>不明</span>
         </el-form-item>
       </el-form>
     </el-col>
+    <!-- v-if="requirement" -->
+    <!-- 模具处理 -->
+    <el-col :span="24" class="title">模具处理</el-col>
+    <el-col :span="12" style="line-height: 32px;">
+      当前保养状态：
+      <span v-if="requirement" style="color: #ff4949;">需要</span>
+      <span v-else style="color: black;">正常</span>
+      <el-button size="small" type="primary" @click="showMaintenance" style="margin-left: 16px;">立即处理</el-button>
+    </el-col>
+    <el-col :span="12" style="line-height: 32px;">
+      云模盒告警：{{warning}}
+      <el-button size="small" type="primary" style="margin-left: 16px;">立即处理</el-button>
+    </el-col>
 
+    <!-- 操作记录 -->
+    <el-col :span="24" class="title">操作记录</el-col>
     <!--列表-->
-    <el-table
-      :data="records"
-      highlight-current-row
-      :height="tableHeight"
-      v-loading="listLoading"
-      style="width: 100%;"
-    >
+    <!-- :height="tableHeight" -->
+    <el-table :data="records" highlight-current-row v-loading="listLoading" style="width: 100%;">
       <el-table-column type="index" width="60"></el-table-column>
       <el-table-column prop="maintainUserName" label="保养人" width="100" sortable></el-table-column>
       <el-table-column prop="maintainType" label="保养方案" sortable></el-table-column>
@@ -41,7 +53,11 @@
           >
             <!-- 大图加载 -->
             <div class="demo-image__preview">
-              <el-image style="width: 100px; height: 100px" :src="scope.row.fileUrl" :preview-src-list="scope.row.fileUrl"></el-image>
+              <el-image
+                style="width: 100px; height: 100px"
+                :src="scope.row.fileUrl"
+                :preview-src-list="scope.row.fileUrl"
+              ></el-image>
             </div>
           </a>
         </template>
@@ -146,9 +162,13 @@ export default {
       mouldId: null,
       //模具名字
       mouldName: null,
+      //模具状态
+      mouldState: 0,
       options: [{ value: "aaa", label: "123" }, { value: "bbb", label: "456" }],
       //记录
       records: [],
+      //警告信息
+      warning: "低电量、过热",
       //标题栏过滤器
       filters: {
         name: "",
@@ -257,6 +277,7 @@ export default {
         res => {
           if (res.code == "ok") {
             this.mouldName = res.data.vo.modelName;
+            this.mouldState = res.data.vo.state;
             this.requirement = res.data.vo.isMaintain == 1;
           } else {
             this.$message({
@@ -326,8 +347,8 @@ export default {
     }
   },
   created() {
-    let height = window.innerHeight;
-    this.tableHeight = height - 260;
+    // let height = window.innerHeight;
+    // this.tableHeight = height - 260;
   },
   mounted() {
     this.mouldId = this.$route.params.id; //传到当前页面的模具编号
@@ -338,6 +359,14 @@ export default {
 </script>
 
 <style scoped>
+.title {
+  padding-left: 10px;
+  padding-bottom: 0px;
+  margin: 20px 0;
+  font-size: 16px;
+  line-height: 24px;
+  border-left: 1px #20a0ff solid;
+}
 .toolbar .el-form-item {
   font-size: 14px;
   vertical-align: middle;

ys_vue/src/views/map/map.vue

@@ -19,68 +19,70 @@
                     if (res.code == "ok") {
                         var list = res.data;
 
-                        var map = new AMap.Map('container', {
-                            resizeEnable: true,   
-                            zoom: 5
-                        });
-                        map.clearMap();  
-                        var markers = [] , 
-                            infoWindow , 
-                            data = list;
+                        if(list != null && list.length > 0){
+                            var map = new AMap.Map('container', {
+                                resizeEnable: true,   
+                                zoom: 5
+                            });
+                            map.clearMap();  
+                            var markers = [] , 
+                                infoWindow , 
+                                data = list;
 
-                        var marker;
-                        for(var i in data){
-                            var jfong=[ data[i].ylng , data[i].xlat];
-                            marker = new AMap.Marker({
-                                position: jfong,
-                                zIndex: 101,
-                                map:map
-                            });	
-                            marker.setMap(map);	
-                            marker.msg = data[i];
-                            marker.on('click', function(data){
-                                var str = "<div class='window'>" +
-                                    "<div class='info-top'><div>"+ data.target.msg.companyName +"</div><i class='el-icon-close' @click='closeInfoWindow()'></i></div>" +
-                                    "<div class='info-middle'>";
-                                    for(var i in data.target.msg.list){
-                                        str += "<div class='info-item'><a @click='jumpToMold("+ data.target.msg.list[i].id +")'>" + data.target.msg.list[i].modelName + "（" + data.target.msg.list[i].modelNo + "）</a>"
-                                            if(data.target.msg.list[i].state=='0'){
-                                                str += "<span class='info-state'><span class='info-ball' style='background:#999999;'></span>静止</span>"
-                                            } else {
-                                                str += "<span class='info-state'><span class='info-ball' style='background:#00CD66;'></span>运行</span>"
-                                            }
-                                        str += "</div>"
-                                    }
-                                    str += "</div>" +
-                                "</div>"
+                            var marker;
+                            for(var i in data){
+                                var jfong=[ data[i].ylng , data[i].xlat];
+                                marker = new AMap.Marker({
+                                    position: jfong,
+                                    zIndex: 101,
+                                    map:map
+                                });	
+                                marker.setMap(map);	
+                                marker.msg = data[i];
+                                marker.on('click', function(data){
+                                    var str = "<div class='window'>" +
+                                        "<div class='info-top'><div>"+ data.target.msg.companyName +"</div><i class='el-icon-close' @click='closeInfoWindow()'></i></div>" +
+                                        "<div class='info-middle'>";
+                                        for(var i in data.target.msg.list){
+                                            str += "<div class='info-item'><a @click='jumpToMold("+ data.target.msg.list[i].id +")'>" + data.target.msg.list[i].modelName + "（" + data.target.msg.list[i].modelNo + "）</a>"
+                                                if(data.target.msg.list[i].state=='0'){
+                                                    str += "<span class='info-state'><span class='info-ball' style='background:#999999;'></span>静止</span>"
+                                                } else {
+                                                    str += "<span class='info-state'><span class='info-ball' style='background:#00CD66;'></span>运行</span>"
+                                                }
+                                            str += "</div>"
+                                        }
+                                        str += "</div>" +
+                                    "</div>"
 
-                                var MyComponent = Vue.extend({
-                                    template: str ,
-                                    methods:{
-                                        closeInfoWindow:function() {
-                                            map.clearInfoWindow();
-                                        },
-                                        jumpToMold:function(id) {
-                                            _this.$router.push("/moldList/" + id);
+                                    var MyComponent = Vue.extend({
+                                        template: str ,
+                                        methods:{
+                                            closeInfoWindow:function() {
+                                                map.clearInfoWindow();
+                                            },
+                                            jumpToMold:function(id) {
+                                                _this.$router.push("/moldList/" + id);
+                                            }
                                         }
-                                    }
+                                    });
+                                    var component= new MyComponent().$mount();
+                                    infoWindow.setContent(component.$el);
+                                    infoWindow.open(map, data.lnglat);
                                 });
-                                var component= new MyComponent().$mount();
-                                infoWindow.setContent(component.$el);
-                                infoWindow.open(map, data.lnglat);
-                            });
-                        }
+                            }
 
-                        infoWindow = new AMap.InfoWindow({
-                            isCustom:	true,
-                            draggable: true,  //是否可拖动
-                            showShadow: true,
-                            autoMove: true,
-                            offset: new AMap.Pixel(0, -31),
-                            content:""
-                        });
+                            infoWindow = new AMap.InfoWindow({
+                                isCustom:	true,
+                                draggable: true,  //是否可拖动
+                                showShadow: true,
+                                autoMove: true,
+                                offset: new AMap.Pixel(0, -31),
+                                content:""
+                            });
 
-                        marker.setMap(map);
+                            marker.setMap(map);
+                        }
                     } else {
                         this.$message({
                             message: res.msg,

ys_vue/src/views/mold/moldDetail.vue

@@ -61,7 +61,7 @@
             </el-col>
             <el-col :span="12" class="detail">
                 所属项目：
-                <span class="info">{{moldDetail.projectName}}</span>
+                <span class="info belongPro" @click="toPro(moldDetail.projectId)">{{moldDetail.projectName}}</span>
             </el-col>
             <el-col :span="24" class="detail">
                 生产方：
@@ -84,9 +84,9 @@
         <el-col :span="24" class="title">
             文档资料
 
-            <!-- 上传 模具0 零件1 时 -->
-            <el-dropdown trigger="click" style="float:right;" v-show="activeTab == 0 && update == 1">
-                <el-button size="small" type="primary">
+            <!-- 上传 模具0 时 -->
+            <el-dropdown trigger="click" style="float: right;" v-show="activeTab == 0 && update == 1">
+                <el-button size="small" type="primary" :loading="uploading[0]">
                     上传
                     <i class="el-icon-arrow-down el-icon--right"></i>
                 </el-button>
@@ -98,13 +98,13 @@
                 </el-dropdown-menu>
             </el-dropdown>
             
-            <!-- 上传 模具0 零件1 时 -->
+            <!-- 上传 零件1 时 -->
             <el-button size="small" type="primary" style="float:right;" v-show="activeTab == 1 && update == 1" @click.native="fileType = 0;centerDialog4Visible = true;">
                 上传
             </el-button>
 
             <!-- 零件1 新建零件 -->
-            <el-dropdown trigger="click" style="float:right; margin-right: 10px;" v-show=" activeTab == 1 && update == 1">
+            <el-dropdown trigger="click" style="float: right; margin-right: 10px;" v-show=" activeTab == 1 && update == 1">
                 <el-button size="small" type="primary">
                     新建零件
                     <i class="el-icon-arrow-down el-icon--right"></i>
@@ -124,7 +124,7 @@
                 </el-dropdown-menu>
             </el-dropdown>
 
-            <!-- 上传 试模2 保养3 更新4 时 -->
+            <!-- 上传 试模2 保养3 时 -->
             <el-upload ref="upload"
                 v-show="(activeTab == 2 || activeTab == 3 || activeTab == 4) && update == 1"
                 action="customize"
@@ -134,19 +134,29 @@
                 :limit="5"
                 style="float:right;"
             >
-                <el-button size="small" type="primary">上传</el-button>
+                <el-button size="small" type="primary" :loading="uploading[1]">上传</el-button>
             </el-upload>
 
+            <!-- 更新4 --><!-- 目前还没加入权限 -->
+            <el-button
+                v-show="activeTab == 4"
+                size="small"
+                type="primary"
+                style="float: right;"
+                @click="updateRequest"
+            >申请</el-button>
+            
             <!-- 上传 报废5 时 -->
             <el-button
                 v-show="activeTab == 5 && update == 1"
                 size="small"
                 type="primary"
-                style="float:right;"
+                style="float: right;"
                 @click="centerDialog2Visible = true;"
             >上传</el-button>
         </el-col>
 
+        <!-- 文档列表部分 -->
         <el-col :span="24">
             <el-tabs v-model="activePage" @tab-click="handleClick">
                 <!-- 模具文档 -->
@@ -329,31 +339,13 @@
                 <el-tab-pane label="模具更新" name="4">
                     <el-table :data="documents.update" highlight-current-row v-loading="listLoading" style="width: 100%;">
                         <el-table-column type="index" width="40"></el-table-column>
-                        <el-table-column prop="fileName" label="名称" sortable></el-table-column>
-                        <el-table-column prop="fileSize" label="大小" width="200" sortable></el-table-column>
-                        <el-table-column prop="uploadtor" label="上传者" width="200" sortable></el-table-column>
-                        <el-table-column prop="indate" label="上传时间" width="200" sortable></el-table-column>
-                        <el-table-column label="状态" width="120" sortable>
-                            <template slot-scope="scope">
-                            <span v-if="scope.row.state == -2">生产方审核不通过</span>
-                            <span v-else-if="scope.row.state == -1">资产方审核不通过</span>
-                            <span v-else-if="scope.row.state == 0">待双方审核</span>
-                            <span v-else-if="scope.row.state == 1">待生产方审核</span>
-                            <span v-else-if="scope.row.state == 2">待资产方审核</span>
-                            <span v-else-if="scope.row.state == 3">审核通过</span>
-                            </template>
-                        </el-table-column>
+                        <el-table-column label="申请人" sortable></el-table-column>
+                        <el-table-column label="申请时间" width="200" sortable></el-table-column>
+                        <el-table-column label="状态" width="120" sortable></el-table-column>
                         <el-table-column label="操作" width="200" sortable>
                             <template slot-scope="scope">
-                                <el-button size="small" 
-                                    v-if="approve == 1 && (scope.row.state == 0 || (scope.row.state == 1 && user.subordinateType == 1) || (scope.row.state == 2 && user.subordinateType == 0))" 
-                                    @click="checkOpen(scope.row.id, scope.row.fileName)">审批</el-button>
-                                <a :href="scope.row.fileUrl" :download="scope.row.fileName" v-if="download == 1 && scope.row.state == 3">
-                                    <el-button size="small" @click="dowloadfile(scope.row.id)">下载</el-button>
-                                </a>
-                                <el-button size="small" 
-                                    v-if="scope.row.uplodtorId == user.id && scope.row.state <= 0" 
-                                    @click="deleteFile(scope.row.id)" type="danger">删除</el-button>
+                                <el-button size="small" @click="updateApproval(scope.row.id, true)" type="primary">通过</el-button>
+                                <el-button size="small" @click="updateApproval(scope.row.id, false)">拒绝</el-button>
                             </template>
                         </el-table-column>
                     </el-table>
@@ -396,7 +388,10 @@
         </el-col>
 
         <!-- 操作记录 -->
-        <el-col :span="24" class="title">操作记录</el-col>
+        <el-col :span="24" class="title">
+            操作记录
+            <el-button size="small" type="primary" style="float: right;" @click="centerDialog5Visible = true">导出</el-button>
+            </el-col>
             <el-table :data="operations" highlight-current-row v-loading="listLoading" style="width: 100%;">
                 <el-table-column type="index" width="40"></el-table-column>
                 <el-table-column prop="content" label="操作" width="120" sortable></el-table-column>
@@ -426,21 +421,31 @@
                 <el-button size="small" type="primary">上传</el-button>
             </el-upload>
             <span slot="footer" class="dialog-footer">
-                <el-button @click="confirmUpload">确定</el-button>
+                <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="clearFileRecord" center>
+        <el-dialog title="零件文档上传" v-if="centerDialog4Visible" :visible.sync="centerDialog4Visible" width="100" :before-close="clearFileRecord2" center>
             <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">上传</el-button>
+                <el-button size="small" type="primary" :loading="uploading[2]">上传</el-button>
             </el-upload>
             <span slot="footer" class="dialog-footer">
                 <el-button @click="uploadFilePart">确定</el-button>
             </span>
         </el-dialog>
 
+        <!-- 批量导出操作记录弹窗 -->
+        <el-dialog title="批量导出操作记录" v-if="centerDialog5Visible" :visible.sync="centerDialog5Visible" width="50" center>
+            <span style="line-height: 40px;">请输入需要导出的时间段</span>
+            <el-date-picker v-model="recordTime" type="datetimerange" placeholder="选择日期时间" style="float: right;"></el-date-picker>
+            <span slot="footer" class="dialog-footer">
+                <el-button @click="centerDialog5Visible = false">取消</el-button>
+                <el-button @click="exportRecords">确定</el-button>
+            </span>
+        </el-dialog>
+
         <!-- 单个新增零件弹窗 -->
         <el-dialog title="新增零件" v-if="centerDialog3Visible" :visible.sync="centerDialog3Visible" :close-on-click-modal="false" customClass="customWidth">
             <el-form :model="newParts" label-width="100px" :rules="formRules" ref="newParts" :inline="true" class="demo-form-inline">
@@ -531,13 +536,15 @@
                 moldDetail: {},
                 customCompany: [],
                 boxes: [],
+                //操作记录的时间
+                recordTime: "",
                 //单独新增零件时所需的三个变量
                 newParts: {
                     number: "",
                     name: "",
                     life: ""
                 },
-
+                uploading:[false, false, false, false],
                 editParts: {
                     id: 0,
                     number: "",
@@ -599,6 +606,7 @@
                 centerDialog2Visible: false, //模具界面
                 centerDialog3Visible: false, //创建零件界面
                 centerDialog4Visible: false, //零件文档上传界面
+                centerDialog5Visible: false, //批量导出操作界面
                 editPortVisible: false,//编辑零件界面
 
                 listLoading: false,
@@ -638,6 +646,10 @@
                 this.$router.push("/detection");
             },
 
+            toPro(id) {
+                this.$router.push('/project/' + id);
+            },
+
             //标签页面切换时
             handleClick(tab, event) {
                 this.activeTab = tab.name;
@@ -852,9 +864,13 @@
             //清理报废文档上传窗口中的文件
             clearFileRecord() {
                 this.centerDialog2Visible = false;
-                this.centerDialog4Visible = false;
                 this.$refs.upload1.clearFiles();
                 this.$refs.upload2.clearFiles();
+            },
+
+            //清理零件文档上传窗口中的文件
+            clearFileRecord2() {
+                this.centerDialog4Visible = false;
                 this.$refs.upload4.clearFiles();
             },
 
@@ -1096,7 +1112,7 @@
                                 list[i].state = 100;
                             }
                         }
-                        console.log(list)
+                        // console.log(list)
                         this.documents.part = list;
                     } else {
                         this.$message({
@@ -1212,6 +1228,25 @@
                         type: "error"
                     });
                 });
+            },
+
+            //更新申请
+            updateRequest(){
+                console.log("发起了申请，但什么都没有发生")
+            },
+
+            //更新批准
+            updateApproval(id, approval){
+                if(approval){
+                    console.log("批准通过了" + id + "的申请，但什么都没有发生");
+                }else{
+                    console.log("批准拒绝了" + id + "的申请，但什么都没有发生");
+                }
+            },
+
+            //导出操作记录
+            exportRecords(){
+                console.log("想要导出记录，但什么都没有发生");
             }
         },
         created() {
@@ -1283,6 +1318,11 @@
         color: grey;
     }
 
+    .belongPro {
+        cursor: pointer;
+        color:#20a0ff;
+    }
+
     .main {
         padding-left: 10px;
     }

ys_vue/src/views/project/competence.vue

@@ -164,6 +164,7 @@
 			getPowerList() {
 				this.listLoading = true;
                 this.http.post(this.port.project.powerList, {
+                    projectId: this.filters.projectId,
                     keyName: this.filters.keyName,
                     pageNum: this.page,
                     pageSize: this.size

ys_vue/src/views/project/projectDetail.vue

@@ -67,7 +67,7 @@
             <el-col :span="24" class="title">项目文档
                 <!-- update == 1 -->
                 <el-upload v-if="user.id == proDetail.managerId" class="upload-demo" action="customize" :http-request="uploadFile" :show-file-list="false" multiple :limit="5" style="float:right;">
-                    <el-button size="small" type="primary">点击上传</el-button>
+                    <el-button size="small" type="primary" :loading="upLoading">点击上传</el-button>
                 </el-upload>
             </el-col>
             <el-col :span="24">
@@ -193,6 +193,7 @@
                 },
 
                 listLoading: false,
+                upLoading: false,
                 oplistLoading: false,
                 activePage: 0,
 
@@ -241,7 +242,8 @@
         methods: {
             //返回
             backToList() {
-                this.$router.push("/project");
+                this.$router.go(-1);
+                // this.$router.push("/project");
             },
             toMold(id) {
                 this.$router.push('/moldList/' + id);
@@ -347,8 +349,11 @@
                         var list = res.data , assets = [] , produce = [];
                         for(var i in list) {
                             if(list[i].companyId == this.user.companyId){
+                                console.log(list[i])
                                 if(list[i].id != this.user.id){
-                                    assets.push(list[i])
+                                    if(list[i].id != this.proDetail.managerId){
+                                        assets.push(list[i])
+                                    }
                                 }
                             } else {
                                 produce.push(list[i])
@@ -592,11 +597,13 @@
             },
             //上传
             uploadFile(params) {
+                this.upLoading = true;
                 var fileObj = params.file;
                 var form = new FormData();
                 form.append("projectId", this.proDetail.id);
                 form.append("file", fileObj);
                 this.http.uploadFile(this.port.project.uploadFile, form , res => {
+                    this.upLoading = false;
                     if (res.code == "ok") {
                         this.$message({
                             message: '上传成功',
@@ -611,6 +618,7 @@
                         });
                     }
                 }, error => {
+                    this.upLoading = false;
                     this.$message({
                         message: error,
                         type: 'error'