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

ys_vue/build/webpack.base.conf.js

@@ -2,6 +2,7 @@ var path = require('path')
 var utils = require('./utils')
 var config = require('../config')
 var vueLoaderConfig = require('./vue-loader.conf')
+var webpack = require("webpack")
 
 function resolve(dir) {
   return path.join(__dirname, '..', dir)
@@ -26,6 +27,12 @@ module.exports = {
       'scss_vars': '@/styles/vars.scss'
     }
   },
+  plugins: [
+    new webpack.ProvidePlugin({
+      jQuery: 'jquery',
+      $: 'jquery'
+    })
+  ],
   module: {
     rules: [
       {

ys_vue/package-lock.json

@@ -3610,14 +3610,12 @@
         "balanced-match": {
           "version": "1.0.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -3632,20 +3630,17 @@
         "code-point-at": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "concat-map": {
           "version": "0.0.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "console-control-strings": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -3762,8 +3757,7 @@
         "inherits": {
           "version": "2.0.3",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "ini": {
           "version": "1.3.5",
@@ -3775,7 +3769,6 @@
           "version": "1.0.0",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -3790,7 +3783,6 @@
           "version": "3.0.4",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
@@ -3798,14 +3790,12 @@
         "minimist": {
           "version": "0.0.8",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "minipass": {
           "version": "2.3.5",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "safe-buffer": "^5.1.2",
             "yallist": "^3.0.0"
@@ -3824,7 +3814,6 @@
           "version": "0.5.1",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "minimist": "0.0.8"
           }
@@ -3905,8 +3894,7 @@
         "number-is-nan": {
           "version": "1.0.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "object-assign": {
           "version": "4.1.1",
@@ -3918,7 +3906,6 @@
           "version": "1.4.0",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -4040,7 +4027,6 @@
           "version": "1.0.2",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
@@ -4977,6 +4963,11 @@
       "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=",
       "dev": true
     },
+    "jquery": {
+      "version": "3.4.1",
+      "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.4.1.tgz",
+      "integrity": "sha512-36+AdBzCL+y6qjw5Tx7HgzeGCzC81MDDgaUP8ld2zhx58HdqXGoBd+tHdrBMiyjGQs0Hxs/MLZTu/eHNJJuWPw=="
+    },
     "js-base64": {
       "version": "2.5.1",
       "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.5.1.tgz",

ys_vue/package.json

@@ -14,6 +14,7 @@
     "echarts": "^3.3.2",
     "element-ui": "^2.10.1",
     "font-awesome": "^4.7.0",
+    "jquery": "^3.4.1",
     "nprogress": "^0.2.0",
     "vue": "^2.6.10",
     "vue-router": "^2.3.0",

ys_vue/src/main.js

@@ -17,6 +17,8 @@ import routes from './routes'
 // import Mock from './mock'
 // Mock.bootstrap();
 
+import $ from 'jquery'
+
 import http from './http'
 Vue.prototype.http = http
 

ys_vue/src/routes.js

@@ -121,8 +121,8 @@ let routes = [
         children: [
             { path: '/moldList', component: moldList, name: '模具列表' },
             { path: '/moldDetail/:id', component: moldDetail, name: '模具详情', hidden: true },
-            { path: '/moldFile', component: moldFile, name: '模具审批' },
-            { path: '/moldDownload', component: moldDownload, name: '模具下载' }
+            { path: '/moldFile', component: moldFile, name: '文档审批' },
+            { path: '/moldDownload', component: moldDownload, name: '文档下载' }
         ]
     },
     // 基础管理

ys_vue/src/views/mold/moldDownload.vue

@@ -1,4 +1,4 @@
-<template>
+<template slot-scope="scope">
   <section>
     <!--工具条-->
     <el-col :span="24" class="toolbar" style="padding-bottom: 0px;">
@@ -21,7 +21,7 @@
           <el-button type="primary">查询</el-button>
         </el-form-item>
         <el-form-item style="float: right;">
-          <el-button type="primary">下载</el-button>
+          <el-button type="primary" id="aa">下载</el-button>
         </el-form-item>
       </el-form>
     </el-col>
@@ -35,40 +35,86 @@
       style="width: 100%;"
     >
       <el-table-column type="index" width="60"></el-table-column>
-      <el-table-column prop="name" label="模具名称" width="200" sortable></el-table-column>
-      <el-table-column label="模具3D图档" width="200" sortable>
+      <el-table-column width="200">
+        <template slot="header">
+          <el-checkbox @change="checkName($event,0)">
+            <span>模具名称</span>
+          </el-checkbox>
+        </template>
         <template slot-scope="scope">
-          <span v-if="scope.row.mould3D == 0">未上传</span>
-          <span v-else-if="scope.row.mould3D == 1">审批中</span>
-          <span v-else>已通过</span>
+          <el-checkbox>
+            <span>{{scope.row.name}}</span>
+          </el-checkbox>
         </template>
       </el-table-column>
-      <el-table-column label="模具2D图档" width="200" sortable>
+      <el-table-column width="200">
+        <template slot="header">
+          <el-checkbox>
+            <span>模具3D图档</span>
+          </el-checkbox>
+        </template>
         <template slot-scope="scope">
-          <span v-if="scope.row.mould2D == 0">未上传</span>
-          <span v-else-if="scope.row.mould2D == 1">审批中</span>
-          <span v-else>已通过</span>
+          <span v-if="scope.row.states[0] == 0" style="padding-left: 24px;">未上传</span>
+          <span v-else-if="scope.row.states[0] == 1" style="padding-left: 24px;">审批中</span>
+          <span v-else>
+            <el-checkbox>已通过</el-checkbox>
+          </span>
         </template>
       </el-table-column>
-      <el-table-column label="零件3D图档" width="200" sortable>
+      <el-table-column width="200">
+        <template slot="header">
+          <el-checkbox>
+            <span>模具2D图档</span>
+          </el-checkbox>
+        </template>
         <template slot-scope="scope">
-          <span v-if="scope.row.part3D == 0">未上传</span>
-          <span v-else-if="scope.row.part3D == 1">审批中</span>
-          <span v-else>已通过</span>
+          <span v-if="scope.row.states[1] == 0" style="padding-left: 24px;">未上传</span>
+          <span v-else-if="scope.row.states[1] == 1" style="padding-left: 24px;">审批中</span>
+          <span v-else>
+            <el-checkbox>已通过</el-checkbox>
+          </span>
         </template>
       </el-table-column>
-      <el-table-column label="零件2D图档" width="200" sortable>
+      <el-table-column width="200">
+        <template slot="header">
+          <el-checkbox>
+            <span>零件3D图档</span>
+          </el-checkbox>
+        </template>
         <template slot-scope="scope">
-          <span v-if="scope.row.part2D == 0">未上传</span>
-          <span v-else-if="scope.row.part2D == 1">审批中</span>
-          <span v-else>已通过</span>
+          <span v-if="scope.row.states[2] == 0" style="padding-left: 24px;">未上传</span>
+          <span v-else-if="scope.row.states[2] == 1" style="padding-left: 24px;">审批中</span>
+          <span v-else>
+            <el-checkbox>已通过</el-checkbox>
+          </span>
         </template>
       </el-table-column>
-      <el-table-column label="保养方案" width="200" sortable>
+      <el-table-column width="200">
+        <template slot="header">
+          <el-checkbox>
+            <span>零件2D图档</span>
+          </el-checkbox>
+        </template>
+        <template slot-scope="scope">
+          <span v-if="scope.row.states[3] == 0" style="padding-left: 24px;">未上传</span>
+          <span v-else-if="scope.row.states[3] == 1" style="padding-left: 24px;">审批中</span>
+          <span v-else>
+            <el-checkbox>已通过</el-checkbox>
+          </span>
+        </template>
+      </el-table-column>
+      <el-table-column width="200">
+        <template slot="header">
+          <el-checkbox>
+            <span>保养方案</span>
+          </el-checkbox>
+        </template>
         <template slot-scope="scope">
-          <span v-if="scope.row.maintenance == 0">未上传</span>
-          <span v-else-if="scope.row.maintenance == 1">审批中</span>
-          <span v-else>已通过</span>
+          <span v-if="scope.row.states[4] == 0" style="padding-left: 24px;">未上传</span>
+          <span v-else-if="scope.row.states[4] == 1" style="padding-left: 24px;">审批中</span>
+          <span v-else>
+            <el-checkbox>已通过</el-checkbox>
+          </span>
         </template>
       </el-table-column>
     </el-table>
@@ -97,21 +143,39 @@ export default {
         //临时数据
         {
           name: "墨盒类型1",
-          mould3D: 0,
-          mould2D: 1,
-          part3D: 2,
-          part2D: 0,
-          maintenance: 1
+          states: [0, 1, 2, 0, 1]
         },
         {
-          name: "墨盒类型啦啦",
-          mould3D: 2,
-          mould2D: 0,
-          part3D: 1,
-          part2D: 2,
-          maintenance: 0
+          name: "墨盒类型2",
+          states: [2, 0, 1, 2, 0]
+        },
+        {
+          name: "墨盒类型3",
+          states: [1, 2, 0, 1, 2]
+        },
+        {
+          name: "墨盒类型4",
+          states: [0, 1, 2, 0, 1]
+        },
+        {
+          name: "墨盒类型5",
+          states: [2, 0, 1, 2, 0]
+        },
+        {
+          name: "墨盒类型6",
+          states: [2, 2, 2, 2, 2]
         }
       ],
+      checkBoxArray: [],
+      defaultItem: { value: false, able: true },
+      defaultLine: [
+        { value: false, able: true },
+        { value: false, able: true },
+        { value: false, able: true },
+        { value: false, able: true },
+        { value: false, able: true },
+        { value: false, able: true }
+      ],
       filters: {
         name: "",
         value: ""
@@ -131,7 +195,7 @@ export default {
       this.size = val;
       // this.getUsers();
     },
-    selsChange: function(sels) {
+    selsChange(sels) {
       this.sels = sels;
     }
   },
@@ -139,7 +203,25 @@ export default {
     let height = window.innerHeight;
     this.tableHeight = height - 210;
   },
-  mounted() {}
+  mounted() {
+    //向checkBoxArray中push信息
+    this.checkBoxArray = [];
+    this.checkBoxArray.push(this.defaultLine);
+    this.moulds.forEach(mould => {
+      var checkBoxLine = [];
+      checkBoxLine.push(this.defaultItem);
+      for (var i = 0; i < 6; i++) {}
+      mould.states.forEach(state => {
+        var value = false;
+        var able = state == 2;
+        var item = { value, able };
+        checkBoxLine.push(item);
+      });
+      // console.log(checkBoxLine);
+      this.checkBoxArray.push(checkBoxLine);
+    });
+    // console.log(this.checkBoxArray);
+  }
 };
 </script>