ソースを参照

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

5 年 前
コミット
535d74d546
3 ファイル変更269 行追加294 行削除
  1. 3 1
      ys_vue/src/routes.js
  2. 147 0
      ys_vue/src/views/mold/moldDownload.vue
  3. 119 293
      ys_vue/src/views/mold/moldFile.vue

+ 3 - 1
ys_vue/src/routes.js

@@ -22,6 +22,7 @@ import competence from './views/project/competence.vue'
 
 import moldList from './views/mold/moldList.vue'
 import moldFile from './views/mold/moldFile.vue'
+import moldDownload from './views/mold/moldDownload.vue'
 import moldDetail from './views/mold/moldDetail.vue'
 
 import role from './views/base/role.vue'
@@ -120,7 +121,8 @@ let routes = [
         children: [
             { path: '/moldList', component: moldList, name: '模具列表' },
             { path: '/moldDetail/:id', component: moldDetail, name: '模具详情', hidden: true },
-            { path: '/moldFile', component: moldFile, name: '模具文档' }
+            { path: '/moldFile', component: moldFile, name: '模具审批' },
+            { path: '/moldDownload', component: moldDownload, name: '模具下载' }
         ]
     },
     // 基础管理

+ 147 - 0
ys_vue/src/views/mold/moldDownload.vue

@@ -0,0 +1,147 @@
+<template>
+  <section>
+    <!--工具条-->
+    <el-col :span="24" class="toolbar" style="padding-bottom: 0px;">
+      <el-form :inline="true" :model="filters">
+        <el-col :span="2">
+          <el-form-item>
+            <el-select v-model="filters.value" clearable placeholder="文档类型">
+              <el-option label="模具3D图档" value="0"></el-option>
+              <el-option label="模具2D图档" value="1"></el-option>
+              <el-option label="零件3D图档" value="2"></el-option>
+              <el-option label="零件2D图档" value="3"></el-option>
+              <el-option label="模具保养方案" value="4"></el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-form-item>
+          <el-input v-model="filters.name" placeholder="请输入名称进行搜索"></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary">查询</el-button>
+        </el-form-item>
+        <el-form-item style="float: right;">
+          <el-button type="primary">下载</el-button>
+        </el-form-item>
+      </el-form>
+    </el-col>
+
+    <!--列表-->
+    <el-table
+      :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="name" label="模具名称" width="200" sortable></el-table-column>
+      <el-table-column label="模具3D图档" width="200" sortable>
+        <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>
+        </template>
+      </el-table-column>
+      <el-table-column label="模具2D图档" width="200" sortable>
+        <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>
+        </template>
+      </el-table-column>
+      <el-table-column label="零件3D图档" width="200" sortable>
+        <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>
+        </template>
+      </el-table-column>
+      <el-table-column label="零件2D图档" width="200" sortable>
+        <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>
+        </template>
+      </el-table-column>
+      <el-table-column label="保养方案" width="200" sortable>
+        <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>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <!--工具条-->
+    <el-col :span="24" class="toolbar">
+      <el-pagination
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        :page-sizes="[20 , 50 , 80 , 100 , 200]"
+        :page-size="20"
+        layout="total, sizes, prev, pager, next"
+        :total="total"
+        style="float:right;"
+      ></el-pagination>
+    </el-col>
+  </section>
+</template>
+
+<script>
+import util from "../../common/js/util";
+export default {
+  data() {
+    return {
+      moulds: [
+        //临时数据
+        {
+          name: "墨盒类型1",
+          mould3D: 0,
+          mould2D: 1,
+          part3D: 2,
+          part2D: 0,
+          maintenance: 1
+        },
+        {
+          name: "墨盒类型啦啦",
+          mould3D: 2,
+          mould2D: 0,
+          part3D: 1,
+          part2D: 2,
+          maintenance: 0
+        }
+      ],
+      filters: {
+        name: "",
+        value: ""
+      },
+      listLoading: false,
+      total: 0,
+      tableHeight: 0
+    };
+  },
+  methods: {
+    //  分页
+    handleCurrentChange(val) {
+      this.page = val;
+      // this.getUsers();
+    },
+    handleSizeChange(val) {
+      this.size = val;
+      // this.getUsers();
+    },
+    selsChange: function(sels) {
+      this.sels = sels;
+    }
+  },
+  created() {
+    let height = window.innerHeight;
+    this.tableHeight = height - 210;
+  },
+  mounted() {}
+};
+</script>
+
+<style scoped>
+</style>

+ 119 - 293
ys_vue/src/views/mold/moldFile.vue

@@ -1,303 +1,129 @@
 <template>
-	<section>
-		<!--工具条-->
-		<el-col :span="24" class="toolbar" style="padding-bottom: 0px;">
-			<el-form :inline="true" :model="filters">
-				<el-form-item>
-					<el-input v-model="filters.name" placeholder="姓名"></el-input>
-				</el-form-item>
-				<el-form-item>
-					<el-button type="primary" v-on:click="getUsers">查询</el-button>
-				</el-form-item>
-				<el-form-item>
-					<el-button type="primary" @click="handleAdd">新增</el-button>
-				</el-form-item>
-			</el-form>
-		</el-col>
+  <section>
+    <!--工具条-->
+    <el-col :span="24" class="toolbar" style="padding-bottom: 0px;">
+      <el-form :inline="true" :model="filters">
+        <el-col :span="2">
+          <el-form-item>
+            <el-select v-model="filters.value" clearable placeholder="全部状态">
+              <el-option label="待审批" value="0"></el-option>
+              <el-option label="未通过" value="1"></el-option>
+              <el-option label="已通过" value="2"></el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-form-item>
+          <el-input v-model="filters.name" placeholder="请输入名称进行搜索"></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary">查询</el-button>
+        </el-form-item>
+        <el-form-item style="float: right;">
+          <el-button type="primary">上传文档</el-button>
+        </el-form-item>
+      </el-form>
+    </el-col>
 
-		<!--列表-->
-		<el-table :data="users" highlight-current-row v-loading="listLoading" @selection-change="selsChange" style="width: 100%;">
-			<el-table-column type="selection" width="55">
-			</el-table-column>
-			<el-table-column type="index" width="60">
-			</el-table-column>
-			<el-table-column prop="name" label="姓名" width="120" sortable>
-			</el-table-column>
-			<el-table-column prop="sex" label="性别" width="100" :formatter="formatSex" sortable>
-			</el-table-column>
-			<el-table-column prop="age" label="年龄" width="100" sortable>
-			</el-table-column>
-			<el-table-column prop="birth" label="生日" width="120" sortable>
-			</el-table-column>
-			<el-table-column prop="addr" label="地址" min-width="180" sortable>
-			</el-table-column>
-			<el-table-column label="操作" width="150">
-				<template slot-scope="scope">
-					<el-button size="small" @click="handleEdit(scope.$index, scope.row)">编辑</el-button>
-					<el-button type="danger" size="small" @click="handleDel(scope.$index, scope.row)">删除</el-button>
-				</template>
-			</el-table-column>
-		</el-table>
+    <!--列表-->
+    <el-table
+      :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="name" label="模具名称" width="200" sortable></el-table-column>
+      <el-table-column prop="type" label="文档类型" width="200" sortable></el-table-column>
+      <el-table-column prop="uploader" label="上传者" width="200" sortable></el-table-column>
+      <el-table-column prop="time" label="上传时间" width="200" sortable></el-table-column>
+      <el-table-column label="上传状态" width="200" sortable>
+        <template slot-scope="scope">
+          <span v-if="scope.row.state == 0">待审批</span>
+          <span v-else-if="scope.row.state == 1">未通过</span>
+          <span v-else>已通过</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="审批" width="200" sortable>
+        <template slot-scope="scope">
+          <template v-if="scope.row.state == 0">
+            <el-button size="small">通过</el-button>
+            <el-button size="small">未通过</el-button>
+          </template>
+        </template>
+      </el-table-column>
+    </el-table>
 
-		<!--工具条-->
-		<el-col :span="24" class="toolbar">
-			<el-button type="danger" @click="batchRemove" :disabled="this.sels.length===0">批量删除</el-button>
-			<el-pagination layout="prev, pager, next" @current-change="handleCurrentChange" :page-size="20" :total="total" style="float:right;">
-			</el-pagination>
-		</el-col>
-
-		<!--编辑界面-->
-		<el-dialog title="编辑" v-model="editFormVisible" :close-on-click-modal="false">
-			<el-form :model="editForm" label-width="80px" :rules="editFormRules" ref="editForm">
-				<el-form-item label="姓名" prop="name">
-					<el-input v-model="editForm.name" autocomplete="off"></el-input>
-				</el-form-item>
-				<el-form-item label="性别">
-					<el-radio-group v-model="editForm.sex">
-						<el-radio class="radio" :label="1">男</el-radio>
-						<el-radio class="radio" :label="0">女</el-radio>
-					</el-radio-group>
-				</el-form-item>
-				<el-form-item label="年龄">
-					<el-input-number v-model="editForm.age" :min="0" :max="200"></el-input-number>
-				</el-form-item>
-				<el-form-item label="生日">
-					<el-date-picker type="date" placeholder="选择日期" v-model="editForm.birth"></el-date-picker>
-				</el-form-item>
-				<el-form-item label="地址">
-					<el-input type="textarea" v-model="editForm.addr"></el-input>
-				</el-form-item>
-			</el-form>
-			<div slot="footer" class="dialog-footer">
-				<el-button @click.native="editFormVisible = false">取消</el-button>
-				<el-button type="primary" @click.native="editSubmit" :loading="editLoading">提交</el-button>
-			</div>
-		</el-dialog>
-
-		<!--新增界面-->
-		<el-dialog title="新增" v-model="addFormVisible" :close-on-click-modal="false">
-			<el-form :model="addForm" label-width="80px" :rules="addFormRules" ref="addForm">
-				<el-form-item label="姓名" prop="name">
-					<el-input v-model="addForm.name" autocomplete="off"></el-input>
-				</el-form-item>
-				<el-form-item label="性别">
-					<el-radio-group v-model="addForm.sex">
-						<el-radio class="radio" :label="1">男</el-radio>
-						<el-radio class="radio" :label="0">女</el-radio>
-					</el-radio-group>
-				</el-form-item>
-				<el-form-item label="年龄">
-					<el-input-number v-model="addForm.age" :min="0" :max="200"></el-input-number>
-				</el-form-item>
-				<el-form-item label="生日">
-					<el-date-picker type="date" placeholder="选择日期" v-model="addForm.birth"></el-date-picker>
-				</el-form-item>
-				<el-form-item label="地址">
-					<el-input type="textarea" v-model="addForm.addr"></el-input>
-				</el-form-item>
-			</el-form>
-			<div slot="footer" class="dialog-footer">
-				<el-button @click.native="addFormVisible = false">取消</el-button>
-				<el-button type="primary" @click.native="addSubmit" :loading="addLoading">提交</el-button>
-			</div>
-		</el-dialog>
-	</section>
+    <!--工具条-->
+    <el-col :span="24" class="toolbar">
+      <el-pagination
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        :page-sizes="[20 , 50 , 80 , 100 , 200]"
+        :page-size="20"
+        layout="total, sizes, prev, pager, next"
+        :total="total"
+        style="float:right;"
+      ></el-pagination>
+    </el-col>
+  </section>
 </template>
 
 <script>
-	import util from '../../common/js/util'
-	//import NProgress from 'nprogress'
-	import { getUserListPage, removeUser, batchRemoveUser, editUser, addUser } from '../../api/api';
-
-	export default {
-		data() {
-			return {
-				filters: {
-					name: ''
-				},
-				users: [],
-				total: 0,
-				page: 1,
-				listLoading: false,
-				sels: [],//列表选中列
-
-				editFormVisible: false,//编辑界面是否显示
-				editLoading: false,
-				editFormRules: {
-					name: [
-						{ required: true, message: '请输入姓名', trigger: 'blur' }
-					]
-				},
-				//编辑界面数据
-				editForm: {
-					id: 0,
-					name: '',
-					sex: -1,
-					age: 0,
-					birth: '',
-					addr: ''
-				},
-
-				addFormVisible: false,//新增界面是否显示
-				addLoading: false,
-				addFormRules: {
-					name: [
-						{ required: true, message: '请输入姓名', trigger: 'blur' }
-					]
-				},
-				//新增界面数据
-				addForm: {
-					name: '',
-					sex: -1,
-					age: 0,
-					birth: '',
-					addr: ''
-				}
-
-			}
-		},
-		methods: {
-			//性别显示转换
-			formatSex: function (row, column) {
-				return row.sex == 1 ? '男' : row.sex == 0 ? '女' : '未知';
-			},
-			handleCurrentChange(val) {
-				this.page = val;
-				this.getUsers();
-			},
-			//获取用户列表
-			getUsers() {
-				let para = {
-					page: this.page,
-					name: this.filters.name
-				};
-				this.listLoading = true;
-				//NProgress.start();
-				getUserListPage(para).then((res) => {
-					this.total = res.data.total;
-					this.users = res.data.users;
-					this.listLoading = false;
-					//NProgress.done();
-				});
-			},
-			//删除
-			handleDel: function (index, row) {
-				this.$confirm('确认删除该记录吗?', '提示', {
-					type: 'warning'
-				}).then(() => {
-					this.listLoading = true;
-					//NProgress.start();
-					let para = { id: row.id };
-					removeUser(para).then((res) => {
-						this.listLoading = false;
-						//NProgress.done();
-						this.$message({
-							message: '删除成功',
-							type: 'success'
-						});
-						this.getUsers();
-					});
-				}).catch(() => {
-
-				});
-			},
-			//显示编辑界面
-			handleEdit: function (index, row) {
-				this.editFormVisible = true;
-				this.editForm = Object.assign({}, row);
-			},
-			//显示新增界面
-			handleAdd: function () {
-				this.addFormVisible = true;
-				this.addForm = {
-					name: '',
-					sex: -1,
-					age: 0,
-					birth: '',
-					addr: ''
-				};
-			},
-			//编辑
-			editSubmit: function () {
-				this.$refs.editForm.validate((valid) => {
-					if (valid) {
-						this.$confirm('确认提交吗?', '提示', {}).then(() => {
-							this.editLoading = true;
-							//NProgress.start();
-							let para = Object.assign({}, this.editForm);
-							para.birth = (!para.birth || para.birth == '') ? '' : util.formatDate.format(new Date(para.birth), 'yyyy-MM-dd');
-							editUser(para).then((res) => {
-								this.editLoading = false;
-								//NProgress.done();
-								this.$message({
-									message: '提交成功',
-									type: 'success'
-								});
-								this.$refs['editForm'].resetFields();
-								this.editFormVisible = false;
-								this.getUsers();
-							});
-						});
-					}
-				});
-			},
-			//新增
-			addSubmit: function () {
-				this.$refs.addForm.validate((valid) => {
-					if (valid) {
-						this.$confirm('确认提交吗?', '提示', {}).then(() => {
-							this.addLoading = true;
-							//NProgress.start();
-							let para = Object.assign({}, this.addForm);
-							para.birth = (!para.birth || para.birth == '') ? '' : util.formatDate.format(new Date(para.birth), 'yyyy-MM-dd');
-							addUser(para).then((res) => {
-								this.addLoading = false;
-								//NProgress.done();
-								this.$message({
-									message: '提交成功',
-									type: 'success'
-								});
-								this.$refs['addForm'].resetFields();
-								this.addFormVisible = false;
-								this.getUsers();
-							});
-						});
-					}
-				});
-			},
-			selsChange: function (sels) {
-				this.sels = sels;
-			},
-			//批量删除
-			batchRemove: function () {
-				var ids = this.sels.map(item => item.id).toString();
-				this.$confirm('确认删除选中记录吗?', '提示', {
-					type: 'warning'
-				}).then(() => {
-					this.listLoading = true;
-					//NProgress.start();
-					let para = { ids: ids };
-					batchRemoveUser(para).then((res) => {
-						this.listLoading = false;
-						//NProgress.done();
-						this.$message({
-							message: '删除成功',
-							type: 'success'
-						});
-						this.getUsers();
-					});
-				}).catch(() => {
-
-				});
-			}
-		},
-		mounted() {
-			this.getUsers();
-		}
-	}
-
+import util from "../../common/js/util";
+export default {
+  data() {
+    return {
+      moulds: [
+        //临时数据
+        {
+          name: "墨盒类型1",
+          type: "模具3D图档",
+          uploader: "张有财",
+          time: "2019-07-25",
+          state: 0
+        },
+        {
+          name: "墨盒类型啦啦",
+          type: "模具2D图档",
+          uploader: "张啦啦",
+          time: "2019-05-27",
+          state: 1
+        }
+      ],
+      filters: {
+        name: "",
+        value: ""
+      },
+      listLoading: false,
+      total: 0,
+      tableHeight: 0
+    };
+  },
+  methods: {
+    //  分页
+    handleCurrentChange(val) {
+      this.page = val;
+      // this.getUsers();
+    },
+    handleSizeChange(val) {
+      this.size = val;
+      // this.getUsers();
+    },
+    selsChange: function(sels) {
+      this.sels = sels;
+    },
+    toMaintenance(id) {
+      this.$router.push("/detection/" + id);
+    }
+  },
+  created() {
+    let height = window.innerHeight;
+    this.tableHeight = height - 210;
+  },
+  mounted() {}
+};
 </script>
 
 <style scoped>
-
 </style>