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

# Conflicts:
#	ys_vue/src/views/mold/moldDetail.vue

ys_vue/src/views/mold/moldDetail.vue

@@ -16,7 +16,7 @@
                 <el-form-item>
                     <span class="projectTitle">测试用模具001</span>
                 </el-form-item>
-                <el-form-item style="float: right;">
+                <el-form-item class="state">
                       当前状态：
                       <a style="color: #409EFF; cursor: pointer" @click="toDetection">运行</a>
                       <span class="tips">（点击查看运行状态）</span>
@@ -89,6 +89,7 @@
                         </template>
                         </el-table-column>
                         <el-table-column label="操作" width="220" sortable>
+                        <el-button size="small">审批</el-button>
                         <el-button size="small">浏览</el-button>
                         <el-button size="small">下载</el-button>
                         <el-button size="small" type="danger">删除</el-button>
@@ -102,42 +103,6 @@
                     <el-tab-pane label="模具报废" name="5">模具报废</el-tab-pane>
                 </el-tabs>
             </el-col>
-    <el-col :span="24" class="title">文档资料</el-col>
-    <el-col :span="24">
-      <el-tabs v-model="activePage" @tab-click="handleClick">
-        <el-tab-pane label="模具文档" name="0">
-          <el-table
-            :data="documents"
-            highlight-current-row
-            v-loading="listLoading"
-            style="width: 100%;"
-          >
-            <el-table-column type="index" width="40"></el-table-column>
-            <el-table-column prop="name" label="名称" sortable></el-table-column>
-            <el-table-column prop="size" label="大小" width="220" sortable></el-table-column>
-            <el-table-column prop="uploader" label="上传者" width="220" sortable></el-table-column>
-            <el-table-column prop="uploadTime" label="上传时间" width="220" sortable></el-table-column>
-            <el-table-column label="状态" width="220" sortable>
-              <template slot-scope="scope">
-                <span v-if="scope.row.state == 0">需要</span>
-                <span v-else>不需要</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="操作" width="300" sortable>
-              <el-button size="small">审批</el-button>
-              <el-button size="small">浏览</el-button>
-              <el-button size="small">下载</el-button>
-              <el-button size="small" type="danger">删除</el-button>
-            </el-table-column>
-          </el-table>
-        </el-tab-pane>
-        <el-tab-pane label="零件文档" name="1">零件文档</el-tab-pane>
-        <el-tab-pane label="试模及验收" name="2">试模及验收</el-tab-pane>
-        <el-tab-pane label="保养方案" name="3">保养方案</el-tab-pane>
-        <el-tab-pane label="模具更新" name="4">模具更新</el-tab-pane>
-        <el-tab-pane label="模具报废" name="5">模具报废</el-tab-pane>
-      </el-tabs>
-    </el-col>
 
             <el-col :span="24" class="title">操作记录</el-col>
             <el-table :data="operations" highlight-current-row v-loading="listLoading" style="width: 100%;height:300px;">
@@ -224,63 +189,6 @@
             var mouldId = this.$route.params.id; //传到当前页面的模具编号
         }
     };
-import util from "../../common/js/util";
-export default {
-  data() {
-    return {
-      //临时数据
-      mould: {
-        typeNumber: "MUJU002",
-        name: "墨模具测试",
-        project: "墨盒项目",
-        client: "南京海市蜃楼有限公司",
-        manufacturer: "南京江宁制造局",
-        mouldNumber: "MOHE0023",
-        lifetime: "1年",
-        initial: "36",
-        RFIDcode: "RFID1234",
-        blueprint: true,
-        BOMtable: true,
-        partList: false,
-        standard: false
-      },
-      documents: [
-        {
-          name: "墨盒产品验证文档.word",
-          size: "100KB",
-          uploader: "张富贵",
-          uploadTime: "2019-07-24",
-          state: 0
-        }
-      ],
-      operations: [
-        {
-          name: "王多银",
-          document: "墨盒产品验证文档.word",
-          operation: 0,
-          time: "时间"
-        }
-      ],
-      listLoading: false,
-      activePage: 0
-    };
-  },
-  methods: {
-    backToList() {
-      this.$router.push("/moldList");
-    },
-    toDetection(){
-      this.$router.push("/detection");
-    },
-    handleClick(tab, event) {
-      console.log(tab, event);
-    }
-  },
-  created() {},
-  mounted() {
-    var mouldId = this.$route.params.id; //传到当前页面的模具编号
-  }
-};
 </script>
 
 <style scoped>
@@ -300,10 +208,18 @@ export default {
     }
 
     .projectTitle {
-        font-size: 19px;
+        font-size: 18px;
         color: #333;
     }
 
+    .state {
+        float: right;
+    }
+
+    .tips {
+        color:#bbb;
+    }
+
     .title {
         padding-left: 10px;
         padding-bottom: 0px;
@@ -324,25 +240,4 @@ export default {
     .detail {
         margin-bottom: 20px;
     }
-.title {
-  padding-left: 10px;
-  padding-bottom: 0px;
-  margin: 20px 0;
-  font-size: 16px;
-  line-height: 16px;
-  border-left: 1px blue solid;
-}
-.info {
-  color: grey;
-}
-.main {
-  padding-left: 10px;
-}
-.detail {
-  margin-bottom: 20px;
-}
-.tips {
-  font-size: 10px;
-  color: grey;
-}
 </style>

ys_vue/src/views/project/projectDetail.vue

@@ -168,7 +168,7 @@
     }
 
     .projectTitle {
-        font-size: 19px;
+        font-size: 18px;
         color: #333;
     }