Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop

hb_client/src/components/customForm/index.vue

@@ -133,7 +133,7 @@
       <el-row v-show="hasPicture">
         <el-form-item label="图表">
           <div>
-            <img id="canvasImg" :src="img" style="width:500px;height: 300px;display: none">
+            <img id="canvasImg" :src="img" style="width:500px;height: 300px;position: absolute;top: -1000px;">
             <div style="position: relative;display: flex;flex-direction: column;
                  border: 1px solid #DCDFE6;">
               <canvas id="canvas" width="500" height="300">
@@ -436,8 +436,8 @@
       draw(){
         let canvasImg = document.getElementById("canvasImg");
         canvasImg.setAttribute("crossOrigin",'anonymous');
-        canvasImg.style.width = '500px';
-        canvasImg.style.height = '300px';
+        // canvasImg.style.width = '500px';
+        // canvasImg.style.height = '300px';
         this.ctx.drawImage(canvasImg,0,0,500,300);
       },
       // 叉号

hb_client/src/views/mtm/material.vue

@@ -340,9 +340,16 @@
           this.processOptions = res.data.results;
         });
       },
-      //绑定工序
+      //检查表
       handlebind(scope) {
-        this.$router.push({name: "MaterialDO", params: {id: scope.row.id},})
+        let materialItem = sessionStorage.getItem('materialItem');
+        if(materialItem){
+          sessionStorage.removeItem('materialItem');
+          sessionStorage.setItem('materialItem',JSON.stringify(scope.row));
+        }else{
+          sessionStorage.setItem('materialItem',JSON.stringify(scope.row));
+        }
+        this.$router.push({name: "MaterialDO", params: {id: scope.row.id}})
       },
       handleFilter() {
         this.listQuery.page = 1;

hb_client/src/views/mtm/materialdo.vue

@@ -1,6 +1,14 @@
 <template>
   <div class="app-container">
     <el-card>
+      <el-card style="margin-top: 2px">
+        <el-descriptions title="物料详情" :column="4" border style="margin-bottom: 10px">
+          <el-descriptions-item label="编号">{{item.number}}</el-descriptions-item>
+          <el-descriptions-item label="类别">{{materialTypes[item.type]}}</el-descriptions-item>
+          <el-descriptions-item label="名称">{{item.name}}</el-descriptions-item>
+          <el-descriptions-item label="规格型号">{{item.specification}}</el-descriptions-item>
+        </el-descriptions>
+      </el-card>
       <el-row :gutter="2">
         <!--表格-->
         <el-col :span="10">
@@ -539,14 +547,12 @@
     name: "",
     number: "",
   };
-
   const defaultrecordform = {enabled: false};
-  const defaultfield = {};
-  let preDrawAry = [];
   export default {
     components: {Pagination, vueJsonEditor, Treeselect, customForm, faceLogin},
     data() {
       return {
+        item:{},
         step: defaultstep,
         stepList: [],
         upHeaders: upHeaders(),
@@ -691,6 +697,15 @@
           40 : "成品检验表",
           50 : "首件检查表",
         },
+        materialTypes: {
+           "1": '成品',
+          "2": '半成品',
+          "3": '主要原料',
+          "4": '辅助材料',
+          "5": '加工工具',
+          "6": '辅助工装',
+
+        },
         canvas: null,
         ctx: null,
         myCanvas_rect: null,
@@ -710,11 +725,10 @@
     },
     computed: {},
     watch: {},
-    created() {
-      this.material = this.$route.params.id;
-      this.recordformLists();
-    },
     mounted(){
+      this.item = JSON.parse(sessionStorage.getItem('materialItem')) ;
+      this.material = this.item.id;
+      this.recordformLists();
       getrecordformList({page:0}).then((response) => {
         if (response.data) {
           this.formList = response.data;

hb_client/src/views/mtm/step.vue

@@ -548,7 +548,7 @@
           }
         ],
         typeoptions: [{
-          value: 1,
+          value: 10,
           label: '生产记录'
         }],
       };

hb_client/src/views/wpm/need.vue

@@ -61,6 +61,8 @@
             >
               <template slot-scope="scope">{{ scope.row.step_.name }}</template>
             </el-table-column>
+            <el-table-column label="创建时间" prop="create_time">
+            </el-table-column>
             <el-table-column align="center" label="操作" width="220px">
               <template slot-scope="scope">
                 <el-link
@@ -175,6 +177,8 @@
             >
               <template slot-scope="scope">{{ scope.row.step_.name }}</template>
             </el-table-column>
+            <el-table-column label="创建时间" prop="create_time">
+            </el-table-column>
             <el-table-column align="center" label="操作" width="220px">
               <template slot-scope="scope">
                 <el-link
@@ -271,6 +275,8 @@
                 <span v-else>{{scope.row.create_by_.username}}</span>
               </template>
             </el-table-column>
+            <el-table-column label="创建时间" prop="create_time">
+            </el-table-column>
             <el-table-column align="center" label="操作" width="220px">
               <template slot-scope="scope">
                 <el-link
@@ -367,6 +373,8 @@
                 <span v-else>{{scope.row.create_by_.username}}</span>
               </template>
             </el-table-column>
+            <el-table-column label="创建时间" prop="create_time">
+            </el-table-column>
             <el-table-column align="center" label="操作" width="220px">
               <template slot-scope="scope">
                 <el-link
@@ -431,6 +439,8 @@
             >
               <template slot-scope="scope">{{ scope.row.step_.name }}</template>
             </el-table-column>
+            <el-table-column label="创建时间" prop="create_time">
+            </el-table-column>
             <el-table-column align="center" label="操作" width="220px">
               <template slot-scope="scope">
                 <el-link
@@ -769,7 +779,7 @@
   import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
   // import {saveAs} from "file-saver";
   // import htmlDocx from "html-docx-js/dist/html-docx";
-  import htmlToPdf from './../../utils/htmlToPdf';
+  //import htmlToPdf from './../../utils/htmlToPdf';
 
   const defaultetestitem = {};
   export default {