浏览代码

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

5 年之前
父节点
当前提交
15c6f1f2ca
共有 5 个文件被更改,包括 981 次插入998 次删除
  1. 1 0
      .idea/modules.xml
  2. 21 7
      ys_vue/package-lock.json
  3. 676 655
      ys_vue/src/views/mold/moldDetail.vue
  4. 282 333
      ys_vue/src/views/mold/moldList.vue
  5. 1 3
      ys_vue/src/views/project/project.vue

+ 1 - 0
.idea/modules.xml

@@ -2,6 +2,7 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
+      <module fileurl="file://$PROJECT_DIR$/cloud-model/cloud-model.iml" filepath="$PROJECT_DIR$/cloud-model/cloud-model.iml" />
       <module fileurl="file://$PROJECT_DIR$/cloud-model/cloud-model.iml" filepath="$PROJECT_DIR$/cloud-model/cloud-model.iml" />
       <module fileurl="file://$PROJECT_DIR$/.idea/yunsu.iml" filepath="$PROJECT_DIR$/.idea/yunsu.iml" />
     </modules>

+ 21 - 7
ys_vue/package-lock.json

@@ -3610,12 +3610,14 @@
         "balanced-match": {
           "version": "1.0.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -3630,17 +3632,20 @@
         "code-point-at": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "concat-map": {
           "version": "0.0.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "console-control-strings": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -3757,7 +3762,8 @@
         "inherits": {
           "version": "2.0.3",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "ini": {
           "version": "1.3.5",
@@ -3769,6 +3775,7 @@
           "version": "1.0.0",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -3783,6 +3790,7 @@
           "version": "3.0.4",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
@@ -3790,12 +3798,14 @@
         "minimist": {
           "version": "0.0.8",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "minipass": {
           "version": "2.3.5",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "safe-buffer": "^5.1.2",
             "yallist": "^3.0.0"
@@ -3814,6 +3824,7 @@
           "version": "0.5.1",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "minimist": "0.0.8"
           }
@@ -3894,7 +3905,8 @@
         "number-is-nan": {
           "version": "1.0.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "object-assign": {
           "version": "4.1.1",
@@ -3906,6 +3918,7 @@
           "version": "1.4.0",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -4027,6 +4040,7 @@
           "version": "1.0.2",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",

文件差异内容过多而无法显示
+ 676 - 655
ys_vue/src/views/mold/moldDetail.vue


+ 282 - 333
ys_vue/src/views/mold/moldList.vue

@@ -1,355 +1,304 @@
 <template>
-  <section>
-    <!--工具条-->
-    <el-col :span="24" class="toolbar" style="padding-bottom: 0px;">
-      <el-form :inline="true" :model="filters">
-        <el-col :span="3">
-          <el-form-item>
-            <el-select v-model="filters.projectId" clearable placeholder="请选择项目">
-              <el-option
-                v-for="item in projects"
-                :key="item.id"
-                :label="item.projectName"
-                :value="item.id"
-              ></el-option>
-            </el-select>
-          </el-form-item>
+    <section>
+        <!--工具条-->
+        <el-col :span="24" class="toolbar" style="padding-bottom: 0px;">
+            <el-form :inline="true" :model="filters">
+                <el-col :span="3">
+                    <el-form-item>
+                        <el-select v-model="filters.projectId" clearable placeholder="请选择项目">
+                        <el-option v-for="item in projects" :key="item.id" :label="item.projectName" :value="item.id"></el-option>
+                        </el-select>
+                    </el-form-item>
+                </el-col>
+                <el-col :span="3">
+                    <el-form-item>
+                        <el-select v-model="filters.searchType" placeholder="请选择查询条件">
+                        <el-option label="编号" value="0"></el-option>
+                        <el-option label="名称" value="1"></el-option>
+                        </el-select>
+                    </el-form-item>
+                </el-col>
+                <el-form-item>
+                    <el-input v-model="filters.keyName" placeholder="请输入编号或名称进行搜索"></el-input>
+                </el-form-item>
+                <el-form-item>
+                    <el-button type="primary" @click="getMoldList">查询</el-button>
+                </el-form-item>
+                <el-form-item style="float: right" v-if="user.parentId == 1">
+                    <el-button type="primary" @click="showAdd">新建</el-button>
+                </el-form-item>
+            </el-form>
         </el-col>
-        <el-col :span="3">
-          <el-form-item>
-            <el-select v-model="filters.searchType" placeholder="请选择查询条件">
-              <el-option label="编号" value="0"></el-option>
-              <el-option label="名称" value="1"></el-option>
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-form-item>
-          <el-input v-model="filters.keyName" placeholder="请输入编号或名称进行搜索"></el-input>
-        </el-form-item>
-        <el-form-item>
-          <el-button type="primary" @click="getMoldList">查询</el-button>
-        </el-form-item>
-        <el-form-item style="float: right" v-if="user.parentId == 1">
-          <el-button type="primary" @click="showAdd">新建</el-button>
-        </el-form-item>
-      </el-form>
-    </el-col>
 
-    <!--列表-->
-    <el-table
-      :data="molds"
-      :height="tableHeight"
-      highlight-current-row
-      v-loading="listLoading"
-      style="width: 100%;"
-    >
-      <el-table-column type="index" width="40"></el-table-column>
-      <el-table-column prop="modelName" label="模具名称" width="180" sortable>
-        <template slot-scope="scope">
-          <el-link
-            :underline="false"
-            type="primary"
-            @click="toDetail(scope.row)"
-          >{{scope.row.modelName}}</el-link>
-        </template>
-      </el-table-column>
-      <el-table-column prop="modelNo" label="模具编号" width="150" sortable></el-table-column>
-      <el-table-column prop="equipmentNo" label="云模盒编号" width="150" sortable></el-table-column>
-      <el-table-column prop="hillNumber" label="电量" align="center" width="100" sortable></el-table-column>
-      <el-table-column prop="projectName" label="所属项目" width="180" sortable></el-table-column>
-      <el-table-column label="所属资产方" width="200" sortable></el-table-column>
-      <el-table-column label="所属生产方" width="200" sortable></el-table-column>
-      <el-table-column prop="settingLife" label="模次寿命" width="100" align="center" sortable></el-table-column>
-      <el-table-column prop="initialModulus" label="初始模次" width="100" align="center" sortable></el-table-column>
-      <el-table-column prop="initial" label="穴数" width="100" align="center" sortable></el-table-column>
-      <el-table-column prop="rfid" label="对应RFID码" width="120" align="center" sortable></el-table-column>
-      <el-table-column label="模具文档" width="100" align="center" sortable>
-        <template slot-scope="scope">
-          <span v-if="scope.row.mouldFile == 1">已上传</span>
-          <span v-else>未上传</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="零件文档" width="100" align="center" sortable>
-        <template slot-scope="scope">
-          <span v-if="scope.row.compFile == 1">已上传</span>
-          <span v-else>未上传</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="保养方案" width="100" align="center" sortable>
-        <template slot-scope="scope">
-          <span v-if="scope.row.maintianPlan == 1">已上传</span>
-          <span v-else>未上传</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="状态" width="100" align="center" sortable>
-        <template slot-scope="scope">
-          <span v-if="scope.row.state == 1" style="color:#00CD66;">运行</span>
-          <span v-else style="color:#CD2626;">禁止</span>
-        </template>
-      </el-table-column>
-      <el-table-column
-        label="操作"
-        width="150"
-        align="center"
-        fixed="right"
-        sortable
-        v-if="user.parentId == 1"
-      >
-        <el-button size="small" type="danger">删除</el-button>
-      </el-table-column>
-    </el-table>
+        <!--列表-->
+        <el-table :data="molds" :height="tableHeight" highlight-current-row v-loading="listLoading" style="width: 100%;">
+            <el-table-column type="index" width="40"></el-table-column>
+            <el-table-column prop="modelName" label="模具名称" width="180" sortable>
+                <template slot-scope="scope">
+                    <el-link :underline="false" type="primary" @click="toDetail(scope.row)">{{scope.row.modelName}}</el-link>
+                </template>
+            </el-table-column>
+            <el-table-column prop="modelNo" label="模具编号" width="150" sortable></el-table-column>
+            <el-table-column prop="equipmentNo" label="云模盒编号" width="150" sortable></el-table-column>
+            <el-table-column prop="hillNumber" label="电量" align="center" width="100" sortable></el-table-column>
+            <el-table-column prop="diffTime" label="倒计时" align="center" width="100" sortable></el-table-column>
+            <el-table-column prop="projectName" label="所属项目" width="180" sortable></el-table-column>
+            <el-table-column prop="ownerCompanyName" label="所属资产方" width="200" sortable></el-table-column>
+            <el-table-column prop="produceCompany" label="所属生产方" width="200" sortable></el-table-column>
+                    <el-table-column prop="initialModulus" label="初始模次" width="100" align="center" sortable></el-table-column>
+            <el-table-column prop="settingLife" label="模次寿命" width="100" align="center" sortable></el-table-column>
+            <el-table-column prop="initial" label="穴数" width="100" align="center" sortable></el-table-column>
+            <el-table-column prop="rfid" label="对应RFID码" width="120" align="center" sortable></el-table-column>
+            <el-table-column label="状态" width="100" align="center" sortable>
+                    <template slot-scope="scope">
+                    <span v-if="scope.row.state == 1" style="color:#00CD66;">运行</span>
+                    <span v-else style="color:#CD2626;">静止</span>
+                    </template>
+            </el-table-column>
+            <el-table-column label="操作" width="150" align="center" fixed="right" sortable v-if="user.parentId == 1">
+                <el-button size="small" type="danger">删除</el-button>
+            </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]"
-        :page-size="20"
-        layout="total, sizes, prev, pager, next"
-        :total="total"
-        style="float:right;"
-      ></el-pagination>
-    </el-col>
+        <!--工具条-->
+        <el-col :span="24" class="toolbar">
+            <el-pagination
+                @size-change="handleSizeChange"
+                @current-change="handleCurrentChange"
+                :page-sizes="[20 , 50 , 80 , 100]"
+                :page-size="20"
+                layout="total, sizes, prev, pager, next"
+                :total="total"
+                style="float:right;"
+            ></el-pagination>
+        </el-col>
 
-    <!--新增界面-->
-    <el-dialog
-      title="新建模具"
-      v-if="addFormVisible"
-      :visible.sync="addFormVisible"
-      :close-on-click-modal="false"
-      customClass="customWidth"
-    >
-      <el-form :model="addForm" label-width="100px" :rules="formRules" ref="addForm">
-        <el-form-item label="模具编号" prop="modelNo">
-          <el-input v-model="addForm.modelNo" autocomplete="off" placeholder="请输入模具编号"></el-input>
-        </el-form-item>
-        <el-form-item label="模具名称" prop="modelName">
-          <el-input v-model="addForm.modelName" autocomplete="off" placeholder="请输入模具名称"></el-input>
-        </el-form-item>
-        <el-form-item label="云模盒编号" prop="equipmentId">
-          <el-select
-            v-model="addForm.equipmentId"
-            clearable
-            filterable
-            placeholder="请选择云模盒编号"
-            style="width:533px"
-          >
-            <el-option
-              v-for="item in boxes"
-              :key="item.id"
-              :label="item.equipmentNo"
-              :value="item.id"
-            ></el-option>
-          </el-select>
-        </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-dialog title="新建模具" v-if="addFormVisible" :visible.sync="addFormVisible" :close-on-click-modal="false" customClass="customWidth">
+            <el-form :model="addForm" label-width="100px" :rules="formRules" ref="addForm" :inline="true" class="demo-form-inline">
+                <el-form-item label="模具名称" prop="modelName">
+                    <el-input v-model="addForm.modelName" autocomplete="off" placeholder="请输入模具名称"></el-input>
+                </el-form-item>
+                <el-form-item label="模具编号" prop="modelNo">
+                    <el-input v-model="addForm.modelNo" autocomplete="off" placeholder="请输入模具编号"></el-input>
+                </el-form-item>
+                <el-form-item label="云模盒编号" prop="equipmentId">
+                    <el-select v-model="addForm.equipmentId" clearable filterable placeholder="请选择云模盒编号" style="width:202px">
+                        <el-option v-for="item in boxes" :key="item.id" :label="item.equipmentNo" :value="item.id"></el-option>
+                    </el-select>
+                </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>
 </template>
 
 <script>
-import util from "../../common/js/util";
-export default {
-  data() {
-    return {
-      user: JSON.parse(sessionStorage.getItem("user")),
-      molds: [],
-      filters: {
-        keyName: "",
-        searchType: "编号",
-        projectId: ""
-      },
-      team: [{label:'资产方',value:0},{label:'生产方',value:1}],
+    import util from "../../common/js/util";
+    export default {
+        data() {
+            return {
+                user: JSON.parse(sessionStorage.getItem("user")),
+                molds: [],
+                filters: {
+                    keyName: "",
+                    searchType: "编号",
+                    projectId: ""
+                },
+                team: [{label:'资产方',value:0},{label:'生产方',value:1}],
 
-      formRules: {
-        modelNo: [
-          { required: true, message: "请输入模具编号", trigger: "blur" }
-        ],
-        modelName: [
-          { required: true, message: "请输入模具名称", trigger: "blur" }
-        ],
-        equipmentId: [
-          {
-            required: true,
-            message: "请选择云模盒编号",
-            trigger: ["blur", "change"]
-          }
-        ]
-      },
-      listLoading: false,
-      total: 0,
-      tableHeight: 0,
-      boxes: [],
-      projects: [],
-
-      addLoading: false,
-      addFormVisible: false,
-      addForm: {
-        modelNo: "",
-        modelName: "",
-        equipmentId: ""
-      }
-    };
-  },
-  methods: {
-    getMsg() {
-      this.http.post(
-        this.port.base.moulds,
-        {
-          belongCompanyId: this.user.companyId
-        },
-        res => {
-          if (res.code == "ok") {
-            this.boxes = res.data;
-          } else {
-            this.$message({
-              message: res.msg,
-              type: "error"
-            });
-          }
-        },
-        error => {
-          this.listLoading = false;
-          this.$message({
-            message: error,
-            type: "error"
-          });
-        }
-      );
+                formRules: {
+                    modelNo: [
+                    { required: true, message: "请输入模具编号", trigger: "blur" }
+                    ],
+                    modelName: [
+                    { required: true, message: "请输入模具名称", trigger: "blur" }
+                    ],
+                    equipmentId: [
+                    {
+                        required: true,
+                        message: "请选择云模盒编号",
+                        trigger: ["blur", "change"]
+                    }
+                    ]
+                },
+                listLoading: false,
+                total: 0,
+                tableHeight: 0,
+                boxes: [],
+                projects: [],
 
-      this.http.post(
-        this.port.project.projects,
-        {},
-        res => {
-          if (res.code == "ok") {
-            this.projects = res.data;
-          } else {
-            this.$message({
-              message: res.msg,
-              type: "error"
-            });
-          }
+                addLoading: false,
+                addFormVisible: false,
+                addForm: {
+                    modelNo: "",
+                    modelName: "",
+                    equipmentId: ""
+                }
+            };
         },
-        error => {
-          this.listLoading = false;
-          this.$message({
-            message: error,
-            type: "error"
-          });
-        }
-      );
-    },
-    //分页
-    handleCurrentChange(val) {
-      this.page = val;
-      this.getMoldList();
-    },
-    handleSizeChange(val) {
-      this.size = val;
-      this.getMoldList();
-    },
+        methods: {
+            getMsg() {
+                this.http.post( this.port.base.moulds, {
+                    belongCompanyId: this.user.companyId
+                },
+                res => {
+                    if (res.code == "ok") {
+                        this.boxes = res.data;
+                    } else {
+                        this.$message({
+                        message: res.msg,
+                        type: "error"
+                        });
+                    }
+                },
+                error => {
+                    this.listLoading = false;
+                    this.$message({
+                        message: error,
+                        type: "error"
+                    });
+                });
 
-    //获取模具列表
-    getMoldList() {
-      this.listLoading = true;
-      this.http.post(
-        this.port.mold.molds,
-        {
-          keyName: this.filters.keyName,
-          pageNum: this.page,
-          pageSize: this.size,
-          projectId: this.filters.projectId == "" ? -1 : this.filters.projectId,
-          searchType: this.filters.searchType == "编号"? 0:1
-        },
-        res => {
-          this.listLoading = false;
-          if (res.code == "ok") {
-            this.molds = res.data.list;
-            this.total = res.data.total;
-          } else {
-            this.$message({
-              message: res.msg,
-              type: "error"
-            });
-          }
-        },
-        error => {
-          this.listLoading = false;
-          this.$message({
-            message: error,
-            type: "error"
-          });
-        }
-      );
-    },
-    //详情
-    toDetail(row) {
-      this.$router.push("/moldList/" + row.id);
-    },
+                this.http.post( this.port.project.projects, {},
+                res => {
+                    if (res.code == "ok") {
+                        this.projects = res.data;
+                    } else {
+                        this.$message({
+                        message: res.msg,
+                        type: "error"
+                        });
+                    }
+                },
+                error => {
+                    this.listLoading = false;
+                    this.$message({
+                        message: error,
+                        type: "error"
+                    });
+                }
+            );
+            },
+            //分页
+            handleCurrentChange(val) {
+                this.page = val;
+                this.getMoldList();
+            },
 
-    //添加界面
-    showAdd() {
-      this.addFormVisible = true;
-      this.addForm = {
-        modelNo: "",
-        modelName: "",
-        equipmentId: ""
-      };
-    },
-    addSubmit() {
-      this.$refs.addForm.validate(valid => {
-        if (valid) {
-          this.addLoading = true;
-          this.http.post(
-            this.port.mold.addMold,
-            this.addForm,
-            res => {
-              this.addLoading = false;
-              this.addFormVisible = false;
-              if (res.code == "ok") {
-                this.$message({
-                  message: "创建成功",
-                  type: "success"
-                });
+            handleSizeChange(val) {
+                this.size = val;
                 this.getMoldList();
-              } else {
-                this.$message({
-                  message: res.msg,
-                  type: "error"
+            },
+
+            //获取模具列表
+            getMoldList() {
+                this.listLoading = true;
+                this.http.post( this.port.mold.molds, {
+                    keyName: this.filters.keyName,
+                    pageNum: this.page,
+                    pageSize: this.size,
+                    projectId: this.filters.projectId == "" ? -1 : this.filters.projectId,
+                    searchType: this.filters.searchType == "编号"? 0:1
+                },
+                res => {
+                    this.listLoading = false;
+                    if (res.code == "ok") {
+                        var list = res.data.list
+                        for(var i in list){
+                            if(list[i].endTime == null){
+                                list[i].diffTime = "";
+                            } else {
+                                list[i].diffTime = util.formatDate.dateDiff(
+                                    util.formatDate.format(new Date(list[i].endTime), 'yyyy-MM-dd'), 
+                                    util.formatDate.format(new Date(new Date()), 'yyyy-MM-dd')
+                                );
+                            }
+                        }
+                        this.molds = list;
+                        this.total = res.data.total;
+                    } else {
+                        this.$message({
+                            message: res.msg,
+                            type: "error"
+                        });
+                    }
+                },
+                error => {
+                    this.listLoading = false;
+                    this.$message({
+                        message: error,
+                        type: "error"
+                    });
                 });
-              }
             },
-            error => {
-              this.addLoading = false;
-              this.addFormVisible = false;
-              this.$message({
-                message: error,
-                type: "error"
-              });
+
+            //详情
+            toDetail(row) {
+            this.$router.push("/moldList/" + row.id);
+            },
+
+            //添加界面
+            showAdd() {
+            this.addFormVisible = true;
+            this.addForm = {
+                modelNo: "",
+                modelName: "",
+                equipmentId: ""
+            };
+            },
+
+            addSubmit() {
+                this.$refs.addForm.validate(valid => {
+                    if (valid) {
+                        this.addLoading = true;
+                        this.http.post(
+                            this.port.mold.addMold,
+                            this.addForm,
+                        res => {
+                            this.addLoading = false;
+                            if (res.code == "ok") {
+                                this.addFormVisible = false;
+                                this.$message({
+                                    message: "创建成功",
+                                    type: "success"
+                                });
+                                this.getMoldList();
+                            } else {
+                                this.$message({
+                                    message: res.msg,
+                                    type: "error"
+                                });
+                            }
+                        },
+                        error => {
+                            this.addLoading = false;
+                            this.addFormVisible = false;
+                            this.$message({
+                                message: error,
+                                type: "error"
+                            });
+                        });
+                    }
+                });
             }
-          );
+        },
+        created() {
+            let height = window.innerHeight;
+            this.tableHeight = height - 210;
+            const that = this;
+            window.onresize = function temp() {
+                that.tableHeight = window.innerHeight - 210;
+            };
+        },
+        mounted() {
+            this.getMsg();
+            this.getMoldList();
         }
-      });
-    }
-  },
-  created() {
-    let height = window.innerHeight;
-    this.tableHeight = height - 210;
-    const that = this;
-    window.onresize = function temp() {
-      that.tableHeight = window.innerHeight - 210;
     };
-  },
-  mounted() {
-    this.getMsg();
-    this.getMoldList();
-  }
-};
 </script>
 
 <style scoped>

+ 1 - 3
ys_vue/src/views/project/project.vue

@@ -100,8 +100,6 @@
                 user: JSON.parse(sessionStorage.getItem('user')),
                 company:[],
                 charger: [],
-                // userA: [],
-                // userB: [],
 
 				list: [],
 				total: 0,
@@ -296,8 +294,8 @@
                             flag: 0
                         } , res => {
                             this.addLoading = false;
-                            this.addFormVisible = false;
                             if (res.code == "ok") {
+                                this.addFormVisible = false;
                                 this.$message({
                                     message: '创建成功',
                                     type: 'success'