From fdd1f1736a6231bfe3bbd1a61f833ea23289a373 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Thu, 19 May 2022 17:50:47 +0800
Subject: [PATCH 1/9] =?UTF-8?q?=E8=BD=A6=E9=97=B4=E6=93=8D=E4=BD=9C?=
 =?UTF-8?q?=E5=AD=90=E5=B7=A5=E5=BA=8F=E8=BF=87=E7=A8=8B=E6=A3=80=E6=9F=A5?=
 =?UTF-8?q?=E8=A1=A8=E5=8F=8A=E8=8F=9C=E5=8D=95=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hb_client/src/router/index.js           | 26 ++++---
 hb_client/src/views/mtm/step.vue        | 99 ++++++++++++++-----------
 hb_client/src/views/wpm/operation.vue   | 44 +++++------
 hb_client/src/views/wpm/operationdo.vue | 32 +++++++-
 4 files changed, 125 insertions(+), 76 deletions(-)

diff --git a/hb_client/src/router/index.js b/hb_client/src/router/index.js
index e02ebec..87a1375 100644
--- a/hb_client/src/router/index.js
+++ b/hb_client/src/router/index.js
@@ -123,6 +123,19 @@ export const asyncRoutes = [
         component: () => import('@/views/mtm/materialDetail.vue'),
         meta: { title: '物料详情' },
         hidden: true
+      }
+
+      ,{
+        path: 'wproductList',
+        name: 'wproductList',
+        component: () => import('@/views/mtm/wproductList'),
+        meta: { title: '半成品列表', icon: 'material', perms: ['mtm_wproduct'] }
+      },
+      {
+        path: 'productList',
+        name: 'productList',
+        component: () => import('@/views/mtm/productList'),
+        meta: { title: '成品列表', icon: 'material', perms: ['mtm_product'] }
       },
       {
         path: 'process',
@@ -151,18 +164,7 @@ export const asyncRoutes = [
         component: () => import('@/views/mtm/productprocess'),
         meta: { title: '产品管理', icon: 'product', perms: ['mtm_productprocess'] }
       }
-      ,{
-        path: 'productList',
-        name: 'productList',
-        component: () => import('@/views/mtm/productList'),
-        meta: { title: '成品列表', icon: 'material', perms: ['mtm_product'] }
-      }
-      ,{
-        path: 'wproductList',
-        name: 'wproductList',
-        component: () => import('@/views/mtm/wproductList'),
-        meta: { title: '半成品列表', icon: 'material', perms: ['mtm_wproduct'] }
-      }
+
     ]
   },
   {
diff --git a/hb_client/src/views/mtm/step.vue b/hb_client/src/views/mtm/step.vue
index 8a75446..d2d90ca 100644
--- a/hb_client/src/views/mtm/step.vue
+++ b/hb_client/src/views/mtm/step.vue
@@ -2,7 +2,7 @@
   <div class="app-container">
     <el-card>
       <div slot="header" class="clearfix">
-    <span style="font-size: 16px;
+        <span style="font-size: 16px;
     font-weight: 700;
 ">子工序列表</span>
       </div>
@@ -117,12 +117,16 @@
         <el-col :span="9">
           <el-card>
             <div slot="header" class="clearfix">
-          <span style="font-size: 16px;
+              <span style="font-size: 16px;
           font-weight: 700;
           ">过程记录表</span>
             </div>
-            <el-button type="primary" icon="el-icon-plus" @click="handleCreate"
-            >新增
+            <el-button
+              type="primary"
+              icon="el-icon-plus"
+              @click="handleCreate"
+            >
+              新增
             </el-button>
             <el-table
               :data="recordformList.results"
@@ -184,30 +188,37 @@
                 label-width="80px"
                 label-position="right"
               >
-
                 <el-form-item label="表格名称" prop="name">
                   <el-input v-model="recordform.name" placeholder="表格名称"/>
                 </el-form-item>
                 <el-form-item label="文件号" prop="number">
                   <el-input v-model="recordform.number" placeholder="文件号"/>
                 </el-form-item>
-
                 <el-form-item label="状态">
                   <el-switch v-model="recordform.enabled"></el-switch>
                 </el-form-item>
-
                 <el-form-item label="表格类型" prop="type">
                   <el-select style="width: 100%" v-model="recordform.type" placeholder="请选择">
                     <el-option
                       v-for="item in typeoptions"
                       :key="item.value"
                       :label="item.label"
-                      :value="item.value">
+                      :value="item.value"
+                    >
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+                <el-form-item label="关联产品">
+                  <el-select style="width: 100%" v-model="recordform.material" placeholder="请选择">
+                    <el-option
+                      v-for="item in productOptions"
+                      :key="item.id"
+                      :label="item.name"
+                      :value="item.id"
+                    >
                     </el-option>
                   </el-select>
                 </el-form-item>
-
-
               </el-form>
               <div style="text-align: right">
                 <el-button type="danger" @click="dialogVisible = false">取消</el-button>
@@ -275,25 +286,24 @@
                   </el-form-item>
                 </el-row>
               </el-form>
-              <!--<div style="text-align: right">-->
-              <!--<el-button type="danger">取消</el-button>-->
-              <!--<el-button type="primary">确认</el-button>-->
-              <!--</div>-->
             </el-dialog>
           </el-card>
         </el-col>
         <el-col :span="15">
           <el-card>
             <div slot="header" class="clearfix">
-          <span style="font-size: 16px;
+              <span style="font-size: 16px;
           font-weight: 700;
           ">记录字段</span>
             </div>
-            <el-button type="primary" icon="el-icon-plus" @click="handlefieldCreate"
-            >新增
+            <el-button
+              type="primary"
+              icon="el-icon-plus"
+              @click="handlefieldCreate"
+            >
+              新增
             </el-button>
             <el-table
-
               :data="fieldList.results"
               border
               fit
@@ -301,51 +311,41 @@
               highlight-current-row
               height="100"
               v-el-height-adaptive-table="{bottomOffset: 50}"
-
             >
-
               <el-table-column type="index" width="50"/>
               <el-table-column label="字段类型">
                 <template slot-scope="scope">{{ options_[scope.row.field_type] }}</template>
               </el-table-column>
-
               <el-table-column label="字段名称">
                 <template slot-scope="scope">{{ scope.row.field_name }}</template>
               </el-table-column>
-
               <el-table-column label="字段标识">
                 <template slot-scope="scope">{{ scope.row.field_key }}</template>
               </el-table-column>
-
               <el-table-column label="选项显示名">
                 <template slot-scope="scope">{{ scope.row.field_choice }}</template>
               </el-table-column>
-
-
               <el-table-column
                 align="center"
                 label="操作"
-
               >
                 <template slot-scope="scope">
-
                   <el-link
                     v-if="checkPermission(['material_update'])"
                     type="primary"
                     @click="handlefieldEdit(scope)"
-                  >编辑
-                  </el-link
                   >
+                    编辑
+                  </el-link>
                   <el-link
                     v-if="checkPermission(['material_delete'])"
                     type="danger"
                     @click="handlefieldDelete(scope)"
-                  >删除
-                  </el-link
                   >
+                    删除
+                  </el-link>
                 </template>
               </el-table-column>
-
             </el-table>
             <pagination
               v-show="fieldList.count > 0"
@@ -368,14 +368,18 @@
                   </el-select>
                 </el-form-item>
                 <el-form-item label="字段标识" prop="field_key">
-                  <el-input v-model="field.field_key" placeholder="字段标识"
-                            onkeyup="value=value.replace(/[^A-Za-z_\/]/ig,'')"/>
+                  <el-input
+                    v-model="field.field_key"
+                    placeholder="字段标识"
+                    onkeyup="value=value.replace(/[^A-Za-z_\/]/ig,'')"
+                  />
                 </el-form-item>
                 <el-form-item label="字段名称" prop="field_name">
                   <el-input v-model="field.field_name" placeholder="字段名称"/>
                 </el-form-item>
-                <el-form-item label="选项"
-                              v-show="field.field_type=='radio'||field.field_type=='checkbox'||field.field_type=='select'||field.field_type=='selects'"
+                <el-form-item
+                  v-show="field.field_type==='radio'||field.field_type==='checkbox'||field.field_type==='select'||field.field_type==='selects'"
+                  label="选项"
                 >
                   <el-button @click.prevent="addDomain" style="border: none;">
                     <i class="el-icon-circle-plus-outline"></i>
@@ -408,12 +412,11 @@
 </template>
 
 <script>
-  import {getStepLists, createStep, updateStep, deleteStep} from "@/api/mtm";
+  import {getStepLists, createStep, updateStep, deleteStep,getMaterialList} from "@/api/mtm";
   import checkPermission from "@/utils/permission";
   import {getEquipmentAll} from "@/api/equipment";
   import {upUrl, upHeaders} from "@/api/file";
   import {
-    getStep,
     getrecordformList,
     createrecordform,
     updaterecordform,
@@ -442,6 +445,7 @@
       return {
         step: defaultstep,
         stepList: [],
+        productOptions: [],
         upHeaders: upHeaders(),
         upUrl: upUrl(),
         fileList: {
@@ -561,9 +565,19 @@
       this.getequipments()
 
     },
+    mounted(){
+      this.getProductList();
+    },
     methods: {
+      getProductList(){
+        getMaterialList({page:0,type:1}).then((response) => {
+          if (response.data) {
+            this.productOptions = response.data;
+          }
+        })
+      },
       //添加字段选项
-      addDomain() {
+      addDomain(){
         this.field_choice.push('')
       },
       //删除字段选项
@@ -739,6 +753,8 @@
       },
       handleEdit(scope) {
         this.recordform = Object.assign({}, scope.row); // copy obj
+        debugger;
+        console.log(this.recordform);
         this.dialogType = "edit";
         this.dialogVisible = true;
         this.$nextTick(() => {
@@ -789,11 +805,10 @@
           if (valid) {
             const isEdit = this.dialogType === "edit";
             if (isEdit) {
-              this.recordform.step = this.stepid
-
+              this.recordform.step = this.stepid;
               updaterecordform(this.recordform.id, this.recordform).then((res) => {
                 if (res.code >= 200) {
-                  this.recordformLists()
+                  this.recordformLists();
                   this.dialogVisible = false;
                   this.$message.success("成功");
                 }
diff --git a/hb_client/src/views/wpm/operation.vue b/hb_client/src/views/wpm/operation.vue
index 8d3958c..12dcebc 100644
--- a/hb_client/src/views/wpm/operation.vue
+++ b/hb_client/src/views/wpm/operation.vue
@@ -24,8 +24,15 @@
             v-el-height-adaptive-table="{bottomOffset: 50}"
           >
             <el-table-column type="index" width="50"/>
+            <el-table-column label="任务编号">
+              <template slot-scope="scope">
+                <div v-for="(item,index) in scope.row.out_detail" :key="index">
+                  {{item.plan.number}}
+                </div>
+              </template>
+            </el-table-column>
             <el-table-column label="子工序工序">
-              <template slot-scope="scope">{{ scope.row.step_.name }}</template>
+              <template slot-scope="scope">{{scope.row.step_.name }}</template>
             </el-table-column>
             <el-table-column label="是否提交">
               <template slot-scope="scope">
@@ -39,30 +46,25 @@
                 <span v-else>{{scope.row.create_by_.username}}</span>
               </template>
             </el-table-column>
-            <el-table-column label="过程记录表">
-              <template v-if="scope.row.record_" slot-scope="scope">
-                <el-tag
-                  v-for="item in scope.row.record_"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.id"
-                >
-                  {{item.name}}
-                </el-tag>
+            <el-table-column label="产品名称">
+              <template slot-scope="scope">
+                <div v-for="(item,index) in scope.row.out_detail" :key="index">
+                  {{item.product.name}}
+                </div>
+              </template>
+            </el-table-column>
+            <el-table-column label="规格型号">
+              <template slot-scope="scope">
+                <div v-for="(item,index) in scope.row.out_detail" :key="index">
+                  {{item.product.specification}}
+                </div>
               </template>
             </el-table-column>
             <el-table-column label="产品数量">
               <template slot-scope="scope">
-                {{ scope.row.count_work }}
-              </template>
-            </el-table-column>
-            <el-table-column label="生产设备">
-              <template slot-scope="scope" v-if="scope.row.equip_">
-                <el-tag v-for="item in scope.row.equip_"
-                        :key="item.id"
-                        :label="item.number"
-                        :value="item.id">{{item.number}}
-                </el-tag>
+                <div v-for="(item,index) in scope.row.out_detail" :key="index">
+                  {{item.count}}
+                </div>
               </template>
             </el-table-column>
             <el-table-column label="创建时间">
diff --git a/hb_client/src/views/wpm/operationdo.vue b/hb_client/src/views/wpm/operationdo.vue
index a85a9c0..22df643 100644
--- a/hb_client/src/views/wpm/operationdo.vue
+++ b/hb_client/src/views/wpm/operationdo.vue
@@ -22,6 +22,24 @@
             disabled="disabled"
           ></el-input>
         </el-form-item>
+        <el-form-item label="任务编号" v-show="operationData.number">
+          <el-input
+            v-model="operationData.number"
+            disabled="disabled"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="产品名称" v-show="operationData.name">
+          <el-input
+            v-model="operationData.name"
+            disabled="disabled"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="规格型号" v-show="operationData.specification">
+          <el-input
+            v-model="operationData.specification"
+            disabled="disabled"
+          ></el-input>
+        </el-form-item>
         <el-form-item label="操作人">
           <el-input
             v-model="operationData.user"
@@ -814,7 +832,7 @@
       };
     },
 
-    created() {
+    mounted() {
       this.id = this.$route.params.id; //操作ID
       this.readbook();
       this.getList(); //边角料
@@ -892,6 +910,18 @@
         getoperation(this.id).then((response) => {
           if (response.data) {
             this.operationData = response.data;
+            let names = '';
+            let numbers = '';
+            let specification = '';
+            response.data.out_detail.forEach(item=>{
+              names +=item.product.name;
+              numbers +=item.plan.number;
+              specification +=item.product.specification;
+            });
+            this.operationData.number = names;
+            this.operationData.name = numbers;
+            this.operationData.specification = specification;
+
             if (response.data.is_submited) {
               this.operationData.user = response.data.create_by_.name;
             } else {

From 20fa9f61227faa7514bf9305441535549b6af34a Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Sat, 21 May 2022 15:37:14 +0800
Subject: [PATCH 2/9] =?UTF-8?q?=E5=B7=A5=E5=BA=8F=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E8=A1=A8=E6=B7=BB=E5=8A=A0=E5=BC=95=E7=94=A8=E8=A1=A8=E5=8D=95?=
 =?UTF-8?q?=EF=BC=8C=E6=9B=B4=E6=94=B9=E6=93=8D=E4=BD=9C=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hb_client/src/views/mtm/productList.vue  |  9 ++++-
 hb_client/src/views/mtm/step.vue         | 49 ++++++++++++++++--------
 hb_client/src/views/mtm/wproductList.vue |  9 ++++-
 hb_client/src/views/wpm/operationdo.vue  | 37 +++++++++++-------
 4 files changed, 73 insertions(+), 31 deletions(-)

diff --git a/hb_client/src/views/mtm/productList.vue b/hb_client/src/views/mtm/productList.vue
index 9b2e82b..f0dfaeb 100644
--- a/hb_client/src/views/mtm/productList.vue
+++ b/hb_client/src/views/mtm/productList.vue
@@ -268,7 +268,14 @@
       },
       //检查表
       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;
diff --git a/hb_client/src/views/mtm/step.vue b/hb_client/src/views/mtm/step.vue
index d2d90ca..1628577 100644
--- a/hb_client/src/views/mtm/step.vue
+++ b/hb_client/src/views/mtm/step.vue
@@ -157,19 +157,16 @@
               >
                 <template slot-scope="scope">
                   <el-link
-                    v-if="checkPermission(['material_update'])"
                     type="primary"
                     @click="handleLook(scope)"
                   >查看
                   </el-link>
                   <el-link
-                    v-if="checkPermission(['material_update'])"
                     type="primary"
                     @click="handleEdit(scope)"
                   >编辑
                   </el-link>
                   <el-link
-                    v-if="checkPermission(['material_delete'])"
                     type="danger"
                     @click="handleDelete(scope)"
                   >删除
@@ -208,6 +205,23 @@
                     </el-option>
                   </el-select>
                 </el-form-item>
+                <el-form-item label="引用表单" v-if="dialogType === 'new'">
+                  <el-select
+                    v-model="recordform.form"
+                    style="width: 100%"
+                    clearable
+                    filterable
+                    placeholder="请选择"
+                  >
+                    <el-option
+                      v-for="item in formList"
+                      :key="item.id"
+                      :label="item.name"
+                      :value="item.id"
+                    >
+                    </el-option>
+                  </el-select>
+                </el-form-item>
                 <el-form-item label="关联产品">
                   <el-select style="width: 100%" v-model="recordform.material" placeholder="请选择">
                     <el-option
@@ -231,22 +245,21 @@
               :visible.sync="dialogVisibleForm"
               :title="tableForm.name">
               <el-form
-                label-width="80px"
+                label-width="180px"
                 label-position="right"
               >
                 <el-row v-for="(item,$index) in fieldList.results" :key="$index">
                   <el-form-item v-if="item.field_type==='string'" :label="item.field_name">
-                    <el-input placeholder="请输入" v-model="item.sort"/>
+                    <el-input placeholder="请输入"/>
                   </el-form-item>
                   <el-form-item v-else-if="item.field_type==='int'" :label="item.field_name">
-                    <el-input type="number" placeholder="请输入" v-model="item.sort"/>
+                    <el-input type="number" placeholder="请输入" />
                   </el-form-item>
                   <el-form-item v-else-if="item.field_type==='float'" :label="item.field_name">
-                    <el-input type="number" placeholder="请输入" v-model="item.sort"/>
+                    <el-input type="number" placeholder="请输入"/>
                   </el-form-item>
                   <el-form-item v-else-if="item.field_type==='date'" :label="item.field_name">
                     <el-date-picker
-                      v-model="item.create_time"
                       type="date"
                       placeholder="选择日期"
                       value-format="yyyy-MM-dd"
@@ -256,7 +269,6 @@
                   </el-form-item>
                   <el-form-item v-else-if="item.field_type==='datetime'" :label="item.field_name">
                     <el-date-picker
-                      v-model="item.create_time"
                       type="datetime"
                       placeholder="选择日期"
                       value-format="yyyy-MM-dd HH:mm:ss"
@@ -265,7 +277,7 @@
                     </el-date-picker>
                   </el-form-item>
                   <el-form-item v-else-if="item.field_type==='select'" :label="item.field_name">
-                    <el-select style="width: 100%" v-model="item.sort" placeholder="请选择">
+                    <el-select style="width: 100%" placeholder="请选择">
                       <el-option
                         v-for="item1 in item.field_choice"
                         :key="item1"
@@ -275,7 +287,7 @@
                     </el-select>
                   </el-form-item>
                   <el-form-item v-else-if="item.field_type==='selects'" :label="item.field_name">
-                    <el-select style="width: 100%" v-model="optio" multiple placeholder="请选择">
+                    <el-select style="width: 100%" multiple placeholder="请选择">
                       <el-option
                         v-for="item1 in item.field_choice"
                         :key="item1"
@@ -551,6 +563,7 @@
             label: '多选'
           }
         ],
+        formList:[],
         typeoptions: [{
           value: 10,
           label: '生产记录'
@@ -563,10 +576,11 @@
       this.step.process = this.$route.params.id;
       this.getList();
       this.getequipments()
-
     },
     mounted(){
+      this.step.process = this.$route.params.id;
       this.getProductList();
+      this.getFormList();
     },
     methods: {
       getProductList(){
@@ -585,8 +599,6 @@
         this.field_choice.splice(index, 1)
       },
       handleLook(scope) {
-        debugger;
-        console.log(scope);
         this.dialogVisibleForm = true;
         this.tableForm = Object.assign({}, scope.row); // copy obj
         this.formID = this.tableForm.id;
@@ -647,7 +659,6 @@
         });
       },
       rowClick(row) {
-
         this.stepid = row.id;
         this.recordformLists();
       },
@@ -720,6 +731,14 @@
 
         });
       },
+      getFormList(){
+        getrecordformList({page:0,type:10}).then((response) => {
+          if (response.data) {
+            this.formList = response.data;
+          }
+
+        });
+      },
       fieldLists() {
         this.listQueryfield.form = this.formID
         getrffieldList(this.listQueryfield).then((response) => {
diff --git a/hb_client/src/views/mtm/wproductList.vue b/hb_client/src/views/mtm/wproductList.vue
index 3f174e9..b81c9ab 100644
--- a/hb_client/src/views/mtm/wproductList.vue
+++ b/hb_client/src/views/mtm/wproductList.vue
@@ -241,7 +241,14 @@
         },
         //检查表
         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;
diff --git a/hb_client/src/views/wpm/operationdo.vue b/hb_client/src/views/wpm/operationdo.vue
index 22df643..5873372 100644
--- a/hb_client/src/views/wpm/operationdo.vue
+++ b/hb_client/src/views/wpm/operationdo.vue
@@ -10,7 +10,23 @@
         >查看作业指导书
         </el-button>
       </div>
-      <el-form
+      <el-descriptions :column="3" border style="margin-bottom: 20px">
+        <el-descriptions-item label="任务编号" v-if="operationData.number">{{operationData.number}}</el-descriptions-item>
+        <el-descriptions-item label="产品名称" v-if="operationData.name">{{operationData.name}}</el-descriptions-item>
+        <el-descriptions-item label="规格型号" v-if="operationData.specification">{{operationData.specification}}</el-descriptions-item>
+        <el-descriptions-item label="子工序">{{operationData.step_.name}}</el-descriptions-item>
+        <el-descriptions-item label="创建时间">{{operationData.create_time}}</el-descriptions-item>
+        <el-descriptions-item label="操作人">{{operationData.user}}</el-descriptions-item>
+      </el-descriptions>
+      <el-button
+        v-if="operationData.is_submited == false"
+        type="primary"
+        style="float: right"
+        @click="handlesubmit()"
+      >
+        提交本次操作
+      </el-button>
+     <!-- <el-form
         ref="form"
         inline="true"
         :model="operationData"
@@ -53,16 +69,9 @@
           ></el-input>
         </el-form-item>
         <el-form-item>
-          <el-button
-            v-if="operationData.is_submited == false"
-            type="primary"
-            style="float: right"
-            @click="handlesubmit()"
-          >
-            提交本次操作
-          </el-button>
+
         </el-form-item>
-        <!--
+        &lt;!&ndash;
           <el-form-item label="边角料">
             <el-radio-group v-model="operationData.use_scrap">
               <el-radio border
@@ -76,7 +85,7 @@
           <el-form-item label="备注" v-if="operationData.use_scrap">
             <el-input type="textarea" v-model="operationData.remark"></el-input>
           </el-form-item>
-!-->
+!&ndash;&gt;
         <el-form-item v-if="operationData.use_scrap">
           <el-button
             type="primary"
@@ -86,7 +95,7 @@
           </el-button>
           <el-button>取消</el-button>
         </el-form-item>
-      </el-form>
+      </el-form>-->
       <el-drawer
         title="作业指导书查看!"
         :visible.sync="drawer"
@@ -918,8 +927,8 @@
               numbers +=item.plan.number;
               specification +=item.product.specification;
             });
-            this.operationData.number = names;
-            this.operationData.name = numbers;
+            this.operationData.number = numbers;
+            this.operationData.name =  names;
             this.operationData.specification = specification;
 
             if (response.data.is_submited) {

From f80e491f12aa4e41d49798a740213019d222badf Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Tue, 24 May 2022 09:28:11 +0800
Subject: [PATCH 3/9] =?UTF-8?q?field=5Fkey=E8=BE=93=E5=85=A5=E8=A7=84?=
 =?UTF-8?q?=E5=88=99=E5=8F=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hb_client/src/views/mtm/step.vue | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/hb_client/src/views/mtm/step.vue b/hb_client/src/views/mtm/step.vue
index 1628577..c5d3838 100644
--- a/hb_client/src/views/mtm/step.vue
+++ b/hb_client/src/views/mtm/step.vue
@@ -139,8 +139,9 @@
               @current-change="handleCurrentChange"
             >
               <el-table-column type="index" width="50"/>
-              <el-table-column label="名称">
-                <template slot-scope="scope">{{ scope.row.name }}</template>
+              <el-table-column label="名称" prop="name"></el-table-column>
+              <el-table-column label="关联产品">
+                <template slot-scope="scope" v-if="scope.row.material_">{{ scope.row.material_.name }}</template>
               </el-table-column>
               <el-table-column label="状态">
                 <template slot-scope="scope">
@@ -223,7 +224,7 @@
                   </el-select>
                 </el-form-item>
                 <el-form-item label="关联产品">
-                  <el-select style="width: 100%" v-model="recordform.material" placeholder="请选择">
+                  <el-select style="width: 100%" v-model="recordform.material" clearable placeholder="请选择">
                     <el-option
                       v-for="item in productOptions"
                       :key="item.id"
@@ -383,7 +384,7 @@
                   <el-input
                     v-model="field.field_key"
                     placeholder="字段标识"
-                    onkeyup="value=value.replace(/[^A-Za-z_\/]/ig,'')"
+                    onkeyup="value=value.replace(/[^0-9A-Za-z_\/]/ig,'')"
                   />
                 </el-form-item>
                 <el-form-item label="字段名称" prop="field_name">

From 791b6606eb4f7066d8e35b76197a7170c524fb1c Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Wed, 25 May 2022 10:05:41 +0800
Subject: [PATCH 4/9] fieldList

---
 hb_client/src/views/mtm/materialdo.vue | 17 ++++++-----
 hb_client/src/views/mtm/step.vue       | 42 ++++++++++++--------------
 2 files changed, 30 insertions(+), 29 deletions(-)

diff --git a/hb_client/src/views/mtm/materialdo.vue b/hb_client/src/views/mtm/materialdo.vue
index 4cd5e83..49fd4c1 100644
--- a/hb_client/src/views/mtm/materialdo.vue
+++ b/hb_client/src/views/mtm/materialdo.vue
@@ -154,7 +154,7 @@
               :title="tableForm.name"
             >
               <customForm
-                :results="fieldList.results"
+                :results="dialogFieldList"
                 :hasPicture="hasPicture"
                 :formID="formID"
                 :isDisabled="isDisabled"
@@ -555,6 +555,7 @@
         item:{},
         step: defaultstep,
         stepList: [],
+        dialogFieldList: [],
         upHeaders: upHeaders(),
         upUrl: upUrl(),
         fileList: [],
@@ -835,7 +836,7 @@
         }
       },
       checkValue() {
-        this.field.field_key = this.field.field_key.replace(/[^a-zA-Z]/g, '');
+        this.field.field_key = this.field.field_key.replace(/[^0-9a-zA-Z]/g, '');
       },
       //添加字段选项
       addDomain() {
@@ -852,9 +853,14 @@
         that.listQueryfield.form = that.formID;
         getrffieldList(that.listQueryfield).then((response) => {
           if (response.data) {
-            this.hasPicture = false;
             that.fieldList = response.data;
-            let list = response.data.results;
+          }
+        });
+        getrffieldList({page:0,form:that.formID}).then((response) => {
+          if (response.data) {
+            this.hasPicture = false;
+            let list = response.data;
+            this.dialogFieldList= response.data;
             let arr = list.filter(item => {
               return item.field_type === 'draw'
             });
@@ -877,9 +883,6 @@
               that.$set(that.checkForm, key, '')
             }
             that.dialogVisibleForm = true;
-            /* setTimeout(function () {
-               that.canvasInit();
-             }, 500);*/
           }
         });
         that.fieldLists();
diff --git a/hb_client/src/views/mtm/step.vue b/hb_client/src/views/mtm/step.vue
index c5d3838..1e29882 100644
--- a/hb_client/src/views/mtm/step.vue
+++ b/hb_client/src/views/mtm/step.vue
@@ -249,7 +249,7 @@
                 label-width="180px"
                 label-position="right"
               >
-                <el-row v-for="(item,$index) in fieldList.results" :key="$index">
+                <el-row v-for="(item,$index) in dialogFieldList" :key="$index">
                   <el-form-item v-if="item.field_type==='string'" :label="item.field_name">
                     <el-input placeholder="请输入"/>
                   </el-form-item>
@@ -458,6 +458,7 @@
       return {
         step: defaultstep,
         stepList: [],
+        dialogFieldList: [],
         productOptions: [],
         upHeaders: upHeaders(),
         upUrl: upUrl(),
@@ -601,9 +602,14 @@
       },
       handleLook(scope) {
         this.dialogVisibleForm = true;
-        this.tableForm = Object.assign({}, scope.row); // copy obj
+        this.dialogFieldList = [];
+        this.tableForm = Object.assign({}, scope.row);
         this.formID = this.tableForm.id;
-        this.fieldLists();
+        getrffieldList({page:0,form:this.formID}).then((response) => {
+          if (response.data) {
+            this.dialogFieldList = response.data;
+          }
+        });
       },
       checkPermission,
       //子工序列表
@@ -638,7 +644,6 @@
         this.step.instruction = null;
       },
 
-
       handleFilter() {
         this.listQuery.page = 1;
         this.getList();
@@ -659,6 +664,7 @@
           this.$refs["Form"].clearValidate();
         });
       },
+
       rowClick(row) {
         this.stepid = row.id;
         this.recordformLists();
@@ -673,6 +679,7 @@
           this.$refs["Form"].clearValidate();
         });
       },
+
       handleDeleteStep(scope) {
         this.$confirm("确认删除?", "警告", {
           confirmButtonText: "确认",
@@ -703,7 +710,6 @@
                 }
               });
             } else {
-              console.log(this.step)
               createStep(this.step).then((res) => {
                 if (res.code >= 200) {
                   this.getList();
@@ -717,11 +723,12 @@
           }
         });
       },
+
       handleCurrentChange(row) {
         this.formID = row.id;
         this.fieldLists();
-
       },
+
       recordformLists() {
         this.listQueryrecordform.step = this.stepid;
         this.listQueryrecordform.type = 10;
@@ -729,7 +736,6 @@
           if (response.data) {
             this.recordformList = response.data;
           }
-
         });
       },
       getFormList(){
@@ -737,18 +743,14 @@
           if (response.data) {
             this.formList = response.data;
           }
-
         });
       },
       fieldLists() {
-        this.listQueryfield.form = this.formID
+        this.listQueryfield.form = this.formID;
         getrffieldList(this.listQueryfield).then((response) => {
           if (response.data) {
             this.fieldList = response.data;
-            debugger;
-            console.log(this.fieldList)
           }
-
         });
       },
       //新增记录表
@@ -762,7 +764,6 @@
       },
       //新增字段
       handlefieldCreate() {
-
         this.field_choice = [''];
         this.field = Object.assign({}, defaultfield);
         this.dialogType1 = "new";
@@ -773,8 +774,6 @@
       },
       handleEdit(scope) {
         this.recordform = Object.assign({}, scope.row); // copy obj
-        debugger;
-        console.log(this.recordform);
         this.dialogType = "edit";
         this.dialogVisible = true;
         this.$nextTick(() => {
@@ -798,7 +797,7 @@
         })
           .then(async () => {
             await deleterecordform(scope.row.id);
-            this.recordformLists()
+            this.recordformLists();
             this.$message.success("成功");
           })
           .catch((err) => {
@@ -813,7 +812,7 @@
         })
           .then(async () => {
             await deleterffield(scope.row.id);
-            this.fieldLists()
+            this.fieldLists();
             this.$message.success("成功");
           })
           .catch((err) => {
@@ -834,11 +833,10 @@
                 }
               });
             } else {
-              this.recordform.step = this.stepid
-
+              this.recordform.step = this.stepid;
               createrecordform(this.recordform).then((res) => {
                 if (res.code >= 200) {
-                  this.recordformLists()
+                  this.recordformLists();
                   this.dialogVisible = false;
                   this.$message.success("成功");
                 }
@@ -858,7 +856,7 @@
               this.field.field_choice = this.field_choice;
               updaterffield(this.field.id, this.field).then((res) => {
                 if (res.code >= 200) {
-                  this.fieldLists()
+                  this.fieldLists();
                   this.dialogVisible1 = false;
                   this.$message.success("成功");
                 }
@@ -868,7 +866,7 @@
               this.field.field_choice = this.field_choice;
               createrffield(this.field).then((res) => {
                 if (res.code >= 200) {
-                  this.fieldLists()
+                  this.fieldLists();
                   this.dialogVisible1 = false;
                   this.$message.success("成功");
                 }

From 274503442f9e76bff231dd116868ede4efa26774 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Wed, 25 May 2022 15:45:02 +0800
Subject: [PATCH 5/9] 0525bugFixed

---
 hb_client/src/views/inm/fifodetail.vue |  7 ++---
 hb_client/src/views/mtm/materialdo.vue | 10 ++++---
 hb_client/src/views/mtm/step.vue       | 36 +++++++++++++++++++-------
 3 files changed, 37 insertions(+), 16 deletions(-)

diff --git a/hb_client/src/views/inm/fifodetail.vue b/hb_client/src/views/inm/fifodetail.vue
index cd0d640..acd4a30 100644
--- a/hb_client/src/views/inm/fifodetail.vue
+++ b/hb_client/src/views/inm/fifodetail.vue
@@ -53,8 +53,9 @@
           v-if="this.$route.params.pu_order != null"
         >
           <template slot-scope="scope">
-            <el-tag v-if="scope.row.is_testok == false">不合格</el-tag>
-            <el-tag v-else>合格</el-tag>
+            <el-tag v-if="scope.row.is_testok">合格</el-tag>
+            <el-tag v-else-if="scope.row.is_testok===null">未复验</el-tag>
+            <el-tag v-else>不合格</el-tag>
           </template>
         </el-table-column>
 
@@ -86,7 +87,7 @@
               复验记录
             </el-link>
             <el-link
-              v-else-if="scope.row.need_test&&scope.row.test==[]"
+              v-if="scope.row.need_test&&scope.row.test.length===0"
               type="primary"
               @click="handleMaterial(scope)"
             >
diff --git a/hb_client/src/views/mtm/materialdo.vue b/hb_client/src/views/mtm/materialdo.vue
index 49fd4c1..65dfa8f 100644
--- a/hb_client/src/views/mtm/materialdo.vue
+++ b/hb_client/src/views/mtm/materialdo.vue
@@ -154,6 +154,7 @@
               :title="tableForm.name"
             >
               <customForm
+                v-if="dialogVisibleForm"
                 :results="dialogFieldList"
                 :hasPicture="hasPicture"
                 :formID="formID"
@@ -549,7 +550,7 @@
   };
   const defaultrecordform = {enabled: false};
   export default {
-    components: {Pagination, vueJsonEditor, Treeselect, customForm, faceLogin},
+    components: {Pagination,customForm, faceLogin},
     data() {
       return {
         item:{},
@@ -846,8 +847,10 @@
       removeDomain(index) {
         this.field_choice.splice(index, 1);
       },
-      handleLook(scope) {
+       async handleLook(scope) {
+        debugger;
         let that = this;
+        this.dialogFieldList=[];
         that.tableForm = Object.assign({}, scope.row); // copy obj
         that.formID = that.tableForm.id;
         that.listQueryfield.form = that.formID;
@@ -856,7 +859,7 @@
             that.fieldList = response.data;
           }
         });
-        getrffieldList({page:0,form:that.formID}).then((response) => {
+        await getrffieldList({page:0,form:that.formID}).then((response) => {
           if (response.data) {
             this.hasPicture = false;
             let list = response.data;
@@ -885,7 +888,6 @@
             that.dialogVisibleForm = true;
           }
         });
-        that.fieldLists();
       },
       checkPermission,
       handleCurrentChange(row) {
diff --git a/hb_client/src/views/mtm/step.vue b/hb_client/src/views/mtm/step.vue
index 1e29882..536a9bf 100644
--- a/hb_client/src/views/mtm/step.vue
+++ b/hb_client/src/views/mtm/step.vue
@@ -251,16 +251,17 @@
               >
                 <el-row v-for="(item,$index) in dialogFieldList" :key="$index">
                   <el-form-item v-if="item.field_type==='string'" :label="item.field_name">
-                    <el-input placeholder="请输入"/>
+                    <el-input placeholder="请输入" v-model="item.low_limit"/>
                   </el-form-item>
                   <el-form-item v-else-if="item.field_type==='int'" :label="item.field_name">
-                    <el-input type="number" placeholder="请输入" />
+                    <el-input type="number" placeholder="请输入"  v-model="item.low_limit"/>
                   </el-form-item>
                   <el-form-item v-else-if="item.field_type==='float'" :label="item.field_name">
-                    <el-input type="number" placeholder="请输入"/>
+                    <el-input type="number" placeholder="请输入" v-model="item.low_limit"/>
                   </el-form-item>
                   <el-form-item v-else-if="item.field_type==='date'" :label="item.field_name">
                     <el-date-picker
+                      v-model="item.low_limit"
                       type="date"
                       placeholder="选择日期"
                       value-format="yyyy-MM-dd"
@@ -270,6 +271,7 @@
                   </el-form-item>
                   <el-form-item v-else-if="item.field_type==='datetime'" :label="item.field_name">
                     <el-date-picker
+                      v-model="item.low_limit"
                       type="datetime"
                       placeholder="选择日期"
                       value-format="yyyy-MM-dd HH:mm:ss"
@@ -280,6 +282,7 @@
                   <el-form-item v-else-if="item.field_type==='select'" :label="item.field_name">
                     <el-select style="width: 100%" placeholder="请选择">
                       <el-option
+                        v-model="item.low_limit"
                         v-for="item1 in item.field_choice"
                         :key="item1"
                         :label="item1"
@@ -290,6 +293,7 @@
                   <el-form-item v-else-if="item.field_type==='selects'" :label="item.field_name">
                     <el-select style="width: 100%" multiple placeholder="请选择">
                       <el-option
+                        v-model="item.low_limit"
                         v-for="item1 in item.field_choice"
                         :key="item1"
                         :label="item1"
@@ -390,6 +394,9 @@
                 <el-form-item label="字段名称" prop="field_name">
                   <el-input v-model="field.field_name" placeholder="字段名称"/>
                 </el-form-item>
+                <el-form-item label="字段说明">
+                  <el-input v-model="field.help_text" placeholder="字段说明"/>
+                </el-form-item>
                 <el-form-item
                   v-show="field.field_type==='radio'||field.field_type==='checkbox'||field.field_type==='select'||field.field_type==='selects'"
                   label="选项"
@@ -755,12 +762,23 @@
       },
       //新增记录表
       handleCreate() {
-        this.recordform = Object.assign({}, defaultrecordform);
-        this.dialogType = "new";
-        this.dialogVisible = true;
-        this.$nextTick(() => {
-          this.$refs["Forms"].clearValidate();
-        });
+        if(this.stepid!==''&&this.stepid!==null&&this.stepid!==undefined){
+          this.recordform = Object.assign({}, defaultrecordform);
+          this.dialogType = "new";
+          this.dialogVisible = true;
+          this.$nextTick(() => {
+            this.$refs["Forms"].clearValidate();
+          });
+        }else{
+          this.$confirm("请选择子工序", "警告", {
+            confirmButtonText: "确认",
+            type: "error",
+          }) .then(async () => {
+          })
+            .catch(() => {
+            });
+        }
+
       },
       //新增字段
       handlefieldCreate() {

From be095ce94fcbe49c3875620556b76e0b158be308 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Wed, 25 May 2022 16:40:48 +0800
Subject: [PATCH 6/9] 0525bugFixed

---
 hb_client/src/components/customForm/index.vue | 513 +++++++++---------
 1 file changed, 263 insertions(+), 250 deletions(-)

diff --git a/hb_client/src/components/customForm/index.vue b/hb_client/src/components/customForm/index.vue
index 19f982b..b01f50e 100644
--- a/hb_client/src/components/customForm/index.vue
+++ b/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;position: absolute;top: -1000px;">
+            <img id="canvasImg" :src="img" alt="tupian">
             <div style="position: relative;display: flex;flex-direction: column;
                  border: 1px solid #DCDFE6;">
               <canvas id="canvas" width="500" height="300">
@@ -159,7 +159,7 @@
           <el-radio v-model="is_testok" :label="testokFalse">检查不合格</el-radio>
         </el-form-item>
         <div class="dialog-footer" style="text-align: right" v-show="!isDisabled">
-          <el-button  @click="recordCancel">取 消</el-button>
+          <el-button @click="recordCancel">取 消</el-button>
           <el-button type="primary" @click="submitfield('1')">保存</el-button>
           <el-button type="warning" @click="submitfield('2')">提交</el-button>
         </div>
@@ -169,65 +169,67 @@
 </template>
 
 <script>
-  import { upFile } from "@/api/file";
+  import {upFile} from "@/api/file";
+
   let preDrawAry = [];
   export default {
     name: "index",
     props: {
-      results:{
-        type:Array,
+      results: {
+        type: Array,
         default: () => {
           return []
-        }} ,
+        }
+      },
       formID: {
-        type:Number,
-        default:0
+        type: Number,
+        default: 0
       },
       wproduct: {
-        type:Number,
-        default:0
+        type: Number,
+        default: 0
       },
       recordId: {
-        type:Number,
-        default:null
+        type: Number,
+        default: null
       },
-      hasPicture:{
-        type:Boolean,
-        default:false
+      hasPicture: {
+        type: Boolean,
+        default: false
       },
-      isDisabled:{
-        type:Boolean,
-        default:false
+      isDisabled: {
+        type: Boolean,
+        default: false
       }
     },
     mounted() {
       let that = this;
       that.checkForm = {};
       this.form = this.formID;
-      let formData=this.results;
-      that.wproductId=this.wproduct;
+      let formData = this.results;
+      that.wproductId = this.wproduct;
       formData.forEach(item => {
         let obj = new Object();
         obj = item;
-        if(item.field_type === 'draw'){
+        if (item.field_type === 'draw') {
           obj.is_testok = true;
-        }else{
+        } else {
           obj.is_testok = null;
         }
         that.formData.push(obj)
       });
-      that.formData=[...formData];
-      for(let i=0;i<this.results.length;i++){
+      that.formData = [...formData];
+      for (let i = 0; i < this.results.length; i++) {
         let key = this.results[i].field_key;
         //checkForm接收表单数据的对象
         let valu = this.results[i].field_value;
-        if(valu!==null&&valu!==''&&valu!==undefined){
-          that.checkForm[key]=valu;
-          that.$set(that.checkForm,key,valu);
+        if (valu !== null && valu !== '' && valu !== undefined) {
+          that.checkForm[key] = valu;
+          that.$set(that.checkForm, key, valu);
           that.is_save = true;
-        }else{
-          that.checkForm[key]='';
-          that.$set(that.checkForm,key,null)
+        } else {
+          that.checkForm[key] = '';
+          that.$set(that.checkForm, key, null)
         }
       }
       let listJudge = this.formData.filter(item => {
@@ -238,173 +240,173 @@
         obj = item;
         that.judgeList.push(obj)
       });
-      let  imag= this.formData.filter(item => {
+      let imag = this.formData.filter(item => {
         return item.field_type === 'draw';
       });
-      if(imag.length>0){
+      if (imag.length > 0) {
         that.img = new Image();
         that.img.crossOrigin = 'anonymous';
-        let value = imag[0].field_value?imag[0].field_value:imag[0].draw_template;
-        that.img = value;
-        setTimeout(function(){
+        let value = imag[0].field_value!==null ? imag[0].field_value : imag[0].draw_template;
+        that.img =process.env.VUE_APP_BASE_API.replace('/api','')+ value;
+        setTimeout(function () {
           that.canvasInit();
-        },500);
+        }, 1000);
       }
     },
-    data(){
-      return{
-        field:[],
-        checkForm:{},
-        testrecord:{
-          form:this.formID,
-          record_data:[],
-          is_testok:true,
-          wproduct:null,
+    data() {
+      return {
+        field: [],
+        checkForm: {},
+        testrecord: {
+          form: this.formID,
+          record_data: [],
+          is_testok: true,
+          wproduct: null,
         },
-        canvas:null,
-        wproductId:null,
-        ctx:null,
-        myCanvas_rect:null,
-        Txt:null,
-        word:null,
-        img:null,
-        widths:0,
-        heights:0,
-        lineW:3,
-        colorF:"#e42343",
-        imgUrl:'',
-        imgData:'',
-        canvasImg:'',
-        formData:[],//表单数组
-        judgeList:[],//判定数组
-        is_testok:true,
-        testokTrue:true,
-        is_save:false,
-        require:false,
-        testokFalse:false,
-        index:'1',
+        canvas: null,
+        wproductId: null,
+        ctx: null,
+        myCanvas_rect: null,
+        Txt: null,
+        word: null,
+        img: null,
+        widths: 0,
+        heights: 0,
+        lineW: 3,
+        colorF: "#e42343",
+        imgUrl: '',
+        imgData: '',
+        canvasImg: '',
+        formData: [],//表单数组
+        judgeList: [],//判定数组
+        is_testok: true,
+        testokTrue: true,
+        is_save: false,
+        require: false,
+        testokFalse: false,
+        index: '1',
       }
     },
-    methods:{
-      filterBlock(rule,index,field_key){
+    methods: {
+      filterBlock(rule, index, field_key) {
         let that = this;
-        if(rule!==''&&rule!==null&&rule!==undefined){
+        if (rule !== '' && rule !== null && rule !== undefined) {
           let reg = /\{(.+?)\}/g;
-          if(rule.indexOf('||')>-1||rule.indexOf('&&')>-1){
+          if (rule.indexOf('||') > -1 || rule.indexOf('&&') > -1) {
             let tam = '', arr = [];
-            if(rule.indexOf('||')>-1){
+            if (rule.indexOf('||') > -1) {
               arr = rule.split('||');
-            }else{
+            } else {
               arr = rule.split('&&');
             }
-            for (let i = 0;i<arr.length;i++){
+            for (let i = 0; i < arr.length; i++) {
               //获取判断依据
               let a = '';
-              a = arr[i].replace(/`/g,'');
-              a = '`'+ a+'`';
-              let tem =a.match(reg)[0];
+              a = arr[i].replace(/`/g, '');
+              a = '`' + a + '`';
+              let tem = a.match(reg)[0];
               let ky = tem.replace(/\{|\}/g, '');//qipao
-              if(that.checkForm[ky]){
+              if (that.checkForm[ky]) {
                 //替换变量
                 a = a.replace(ky, 'yyy');
-                let yyy = "'"+that.checkForm[ky]+"'";
-                if(eval(eval( a))){
+                let yyy = "'" + that.checkForm[ky] + "'";
+                if (eval(eval(a))) {
                   tam += 'true';
-                }else{
+                } else {
                   tam += 'false';
                 }
-              }else{
+              } else {
                 tam += 'false';
               }
             }
             let rea = true;
-            if(rule.indexOf('||')>-1){
-              if( tam.indexOf('true')>-1){
+            if (rule.indexOf('||') > -1) {
+              if (tam.indexOf('true') > -1) {
                 rea = true;
-              }else{
+              } else {
                 rea = false;
               }
-            }else{
-              if( tam.indexOf('false')>-1){
+            } else {
+              if (tam.indexOf('false') > -1) {
                 rea = false;
-              }else{
+              } else {
                 rea = true;
               }
             }
-            if(rea){
+            if (rea) {
               that.formData[index].is_hidden = false;
-            }else{
+            } else {
               that.formData[index].is_hidden = true;
               that.checkForm[field_key] = null;
             }
             return rea;
-          }else{
-            let temp =rule.match(reg)[0];
+          } else {
+            let temp = rule.match(reg)[0];
             let key = temp.replace(/\{|\}/g, '');//qipao
-            let  a = rule.replace(key, 'yy');
+            let a = rule.replace(key, 'yy');
             a = a.replace(key, 'yy');
-            let yy = "'"+that.checkForm[key]+"'";
-            if(eval(eval(a))){
+            let yy = "'" + that.checkForm[key] + "'";
+            if (eval(eval(a))) {
               that.formData[index].is_hidden = false;
-            }else{
+            } else {
               that.formData[index].is_hidden = true;
               that.checkForm[field_key] = null;
             }
             return eval(eval(a));
           }
-        }else{
+        } else {
           that.formData[index].is_hidden = false;
           return true;
         }
       },
-      keyChange(index,key){
+      keyChange(index, key) {
         let that = this;
         let reg = /\{(.+?)\}/g;
         that.$forceUpdate();
-        that.$nextTick(()=>{
-          if(that.formData[index].need_judge===true){
-            let arr = [],str = '';
-            let item = that.formData[index].rule_expression.replace(/`/g,'');
-            if(item.indexOf('||')>-1){
+        that.$nextTick(() => {
+          if (that.formData[index].need_judge === true) {
+            let arr = [], str = '';
+            let item = that.formData[index].rule_expression.replace(/`/g, '');
+            if (item.indexOf('||') > -1) {
               arr = item.split('||');
-            }else if(item.indexOf('&&')>-1){
+            } else if (item.indexOf('&&') > -1) {
               arr = item.split('&&');
-            }else{
+            } else {
               arr.push(item);
             }
             //对每个条件进行判定，如果符合，
-            for (let i = 0;i<arr.length;i++){
+            for (let i = 0; i < arr.length; i++) {
               //获取判断依据
-              let a = '`'+ arr[i]+'`';
-              let tem =a.match(reg)[0];
+              let a = '`' + arr[i] + '`';
+              let tem = a.match(reg)[0];
               let ky = tem.replace(/\{|\}/g, '');//qipao
               //有值时进行判断
-              if(that.checkForm[ky]!==''&&that.checkForm[ky]!==null&&that.checkForm[ky]!==undefined){
+              if (that.checkForm[ky] !== '' && that.checkForm[ky] !== null && that.checkForm[ky] !== undefined) {
                 //替换变量
                 a = a.replace(ky, 'yyy');
-                let yyy = "'"+that.checkForm[ky]+"'";
-                if(eval(eval( a))){
+                let yyy = "'" + that.checkForm[ky] + "'";
+                if (eval(eval(a))) {
                   str += 'true';
-                }else{
+                } else {
                   str += 'false';
                 }
               }
             }
-            if(item.indexOf('&&')>-1){
-              if(str.indexOf('false')>-1){
+            if (item.indexOf('&&') > -1) {
+              if (str.indexOf('false') > -1) {
                 that.formData[index].is_testok = true;
-                that.$set(that.formData[index],'is_testok',true)
-              }else{
+                that.$set(that.formData[index], 'is_testok', true)
+              } else {
                 that.formData[index].is_testok = false;
-                that.$set(that.formData[index],'is_testok',false)
+                that.$set(that.formData[index], 'is_testok', false)
               }
-            }else{
-              if(str.indexOf('true')>-1){
+            } else {
+              if (str.indexOf('true') > -1) {
                 that.formData[index].is_testok = false;
-                that.$set(that.formData[index],'is_testok',false)
-              }else{
+                that.$set(that.formData[index], 'is_testok', false)
+              } else {
                 that.formData[index].is_testok = true;
-                that.$set(that.formData[index],'is_testok',true)
+                that.$set(that.formData[index], 'is_testok', true)
               }
             }
             that.$forceUpdate();
@@ -418,7 +420,7 @@
       },
       /*  图片保存  */
       //初始化canvas
-      canvasInit(){
+      canvasInit() {
         let that = this;
         preDrawAry = [];
         that.canvas = document.getElementById('canvas');
@@ -428,55 +430,55 @@
         that.word = document.getElementById('word');
         that.widths = that.myCanvas_rect.width;
         that.heights = that.myCanvas_rect.height;
-        setTimeout(function(){
+        setTimeout(function () {
           that.draw();
-        },500);
+        }, 500);
       },
       //画布添加背景模板图
-      draw(){
+      draw() {
+        debugger;
+        this.ctx = document.getElementById('canvas').getContext('2d');
         let canvasImg = document.getElementById("canvasImg");
-        canvasImg.setAttribute("crossOrigin",'anonymous');
-        // canvasImg.style.width = '500px';
-        // canvasImg.style.height = '300px';
-        this.ctx.drawImage(canvasImg,0,0,500,300);
+        // canvasImg.setAttribute("crossOrigin", 'anonymous');
+        this.ctx.drawImage(canvasImg, 0, 0, 500, 300);
       },
       // 叉号
-      error1(){
+      error1() {
         let canvas1 = document.getElementById('canvas');
         let ctx1 = canvas1.getContext('2d');
-        this.Txt.style.display="none";
-        document.getElementById('word').style.display="none";
+        this.Txt.style.display = "none";
+        document.getElementById('word').style.display = "none";
         ctx1.closePath();
-        canvas1.onmousedown=function () {
-          this.imgData= ctx1.getImageData(0,0,canvas1.width,canvas1.height);
+        canvas1.onmousedown = function () {
+          this.imgData = ctx1.getImageData(0, 0, canvas1.width, canvas1.height);
           preDrawAry.push(this.imgData);
           ctx1.beginPath();
           ctx1.strokeStyle = "#e42343";
           ctx1.lineWidth = "3";
-          ctx1.lineJoin="round";
+          ctx1.lineJoin = "round";
         };
         //鼠标按下的位置
-        canvas1.onmouseup=function (ev) {
+        canvas1.onmouseup = function (ev) {
           let oldX = ev.offsetX;
           let oldY = ev.offsetY;
-          ctx1.moveTo(oldX,oldY);
-          ctx1.lineTo(ev.offsetX+10,ev.offsetY+10);
-          ctx1.moveTo(ev.offsetX+10,ev.offsetY);
-          ctx1.lineTo(ev.offsetX,ev.offsetY+10);
+          ctx1.moveTo(oldX, oldY);
+          ctx1.lineTo(ev.offsetX + 10, ev.offsetY + 10);
+          ctx1.moveTo(ev.offsetX + 10, ev.offsetY);
+          ctx1.lineTo(ev.offsetX, ev.offsetY + 10);
           ctx1.stroke();
         };
         this.ctx.closePath();
       },
       // 文字先写字
-      text(){
+      text() {
         let canvas2 = document.getElementById('canvas');
         let ctx2 = canvas2.getContext('2d');
         let Txt2 = document.getElementById('txt');
-        Txt2.style.display="block";
-        document.getElementById('word').style.display="none";
-        ctx2.font="16px Microsoft Yahei";
-        canvas2.onmousedown=function (ev) {
-          this.imgData=ctx2.getImageData(0,0,canvas2.width,canvas2.height);
+        Txt2.style.display = "block";
+        document.getElementById('word').style.display = "none";
+        ctx2.font = "16px Microsoft Yahei";
+        canvas2.onmousedown = function (ev) {
+          this.imgData = ctx2.getImageData(0, 0, canvas2.width, canvas2.height);
           preDrawAry.push(this.imgData);
           var v = Txt2.value;
           //            console.log(v);
@@ -484,63 +486,63 @@
             var oldX = ev.offsetX;
             var oldY = ev.offsetY;
             // console.log(oldX,oldY);
-            ctx2.moveTo(oldX,oldY);
-            canvas2.onmouseup=function () {
-              ctx2.fillStyle=this.colorF;
-              ctx2.fillText(v,oldX,oldY);
-              canvas2.TextAutoLine(v,canvas2,oldX,oldY,20);
+            ctx2.moveTo(oldX, oldY);
+            canvas2.onmouseup = function () {
+              ctx2.fillStyle = this.colorF;
+              ctx2.fillText(v, oldX, oldY);
+              canvas2.TextAutoLine(v, canvas2, oldX, oldY, 20);
               // Txt.value = "";
-              Txt2.style.display="none";
+              Txt2.style.display = "none";
             }
           }
         }
       },
       // 文字
-      word1(){
+      word1() {
         let canvas3 = document.getElementById('canvas');
         let ctx3 = canvas3.getContext('2d');
         let Txt3 = document.getElementById('txt');
         let word3 = document.getElementById('word');
-        Txt3.style.display="none";
-        ctx3.font="16px Microsoft Yahei";
-        canvas3.onmousedown=function () {
+        Txt3.style.display = "none";
+        ctx3.font = "16px Microsoft Yahei";
+        canvas3.onmousedown = function () {
           ctx3.closePath();
         }
-        canvas3.onmouseup=function (ev) {
-          var inputV= document.getElementById('inputV').value;
-          if(inputV == 1){
+        canvas3.onmouseup = function (ev) {
+          var inputV = document.getElementById('inputV').value;
+          if (inputV == 1) {
             document.getElementById('word').focus();
             //               console.log(ev.offsetX,ev.offsetY);
             var oldX = ev.offsetX;
             var oldY = ev.offsetY;
-            word3.style.display="block";
-            word3.style.left=oldX+'px';
-            word3.style.top =oldY+'px';
+            word3.style.display = "block";
+            word3.style.left = oldX + 'px';
+            word3.style.top = oldY + 'px';
 
-            word3.onblur=function () {
+            word3.onblur = function () {
               let v = word3.value;
-              if(v != '' && v != ' '){
-                this.imgData=ctx3.getImageData(0,0,canvas3.width,canvas3.height);
-                let img = ctx3.getImageData(0,0,canvas3.width,canvas3.height);
+              if (v != '' && v != ' ') {
+                this.imgData = ctx3.getImageData(0, 0, canvas3.width, canvas3.height);
+                let img = ctx3.getImageData(0, 0, canvas3.width, canvas3.height);
                 preDrawAry.push(img);
-                ctx3.moveTo(oldX,oldY);
-                ctx3.fillStyle="#e42343";
+                ctx3.moveTo(oldX, oldY);
+                ctx3.fillStyle = "#e42343";
                 let lineWidth = 0;
                 let canvasWidth = canvas3.width;
-                let lastSubStrIndex= 0;
-                for(let i=0;i<v.length;i++){
-                  lineWidth+=ctx3.measureText(v[i]).width;
-                  if(lineWidth>canvasWidth-oldX){
-                    ctx3.fillText(v.substring(lastSubStrIndex,i),oldX,(oldY+10));
-                    oldY+=20;
-                    lineWidth=0;
-                    lastSubStrIndex=i;
+                let lastSubStrIndex = 0;
+                for (let i = 0; i < v.length; i++) {
+                  lineWidth += ctx3.measureText(v[i]).width;
+                  if (lineWidth > canvasWidth - oldX) {
+                    ctx3.fillText(v.substring(lastSubStrIndex, i), oldX, (oldY + 10));
+                    oldY += 20;
+                    lineWidth = 0;
+                    lastSubStrIndex = i;
                   }
-                  if(i==v.length-1){
-                    ctx3.fillText(v.substring(lastSubStrIndex,i+1),oldX,(oldY+10));
+                  if (i == v.length - 1) {
+                    ctx3.fillText(v.substring(lastSubStrIndex, i + 1), oldX, (oldY + 10));
                   }
                 }
-                inputV ="2";
+                inputV = "2";
                 word3.value = "";
               }
             }
@@ -548,42 +550,42 @@
         }
       },
       // 文字过长超出换行toDataURL()
-      canvasTextAutoLine(str,canvas,initX,initY,lineHeight){
+      canvasTextAutoLine(str, canvas, initX, initY, lineHeight) {
         let ctx = canvas.getContext("2d");
         let lineWidth = 0;
         let canvasWidth = canvas.width;
-        let lastSubStrIndex= 0;
-        for(let i=0;i<str.length;i++){
-          lineWidth+=ctx.measureText(str[i]).width;
-          if(lineWidth>canvasWidth-initX){
-            ctx.fillText(str.substring(lastSubStrIndex,i),initX,initY);
-            initY+=lineHeight;
-            lineWidth=0;
-            lastSubStrIndex=i;
+        let lastSubStrIndex = 0;
+        for (let i = 0; i < str.length; i++) {
+          lineWidth += ctx.measureText(str[i]).width;
+          if (lineWidth > canvasWidth - initX) {
+            ctx.fillText(str.substring(lastSubStrIndex, i), initX, initY);
+            initY += lineHeight;
+            lineWidth = 0;
+            lastSubStrIndex = i;
           }
-          if(i==str.length-1){
-            ctx.fillText(str.substring(lastSubStrIndex,i+1),initX,initY);
+          if (i == str.length - 1) {
+            ctx.fillText(str.substring(lastSubStrIndex, i + 1), initX, initY);
           }
         }
       },
       // 撤销
-      back(){
-        this.word.style.display="none";
-        this.Txt.style.display="none";
-        if(preDrawAry.length>0) {
+      back() {
+        this.word.style.display = "none";
+        this.Txt.style.display = "none";
+        if (preDrawAry.length > 0) {
           var popData = preDrawAry.pop();
           this.ctx.putImageData(popData, 0, 0);
         }
       },
       // 回退一次
-      put(){
-        this.ctx.putImageData(this.imgData,0,0);
+      put() {
+        this.ctx.putImageData(this.imgData, 0, 0);
       },
       //保存
-      saveTu(){
+      saveTu() {
         let that = this;
-        this.word.style.display="none";
-        this.Txt.style.display="none";
+        this.word.style.display = "none";
+        this.Txt.style.display = "none";
         let canvas = document.getElementById('canvas');
         let image = new Image();
         image = canvas.toDataURL('image/png');
@@ -592,7 +594,7 @@
         let formData = new FormData();
         formData.append('file', file);
         upFile(formData).then((res) => {
-          that.imgUrl=res.data.path;
+          that.imgUrl = res.data.path;
         })
       },
       //base64ToFile
@@ -600,69 +602,69 @@
         let arr = baseUrl.split(',');
         // let type = arr[0].match(/:(.*?);/)[1];   // 解锁图片类型
         let bytes = atob(arr[1]); // 解码base64
-        let n = bytes .length;
+        let n = bytes.length;
         let bufferArray = new Uint8Array(n);
         while (n--) {
           bufferArray[n] = bytes.charCodeAt(n);
         }
         // let fileOfBlob = new File([bufferArray], new Date()+'.jpg');
-        return new File([bufferArray ],'draw.jpg');
+        return new File([bufferArray], 'draw.jpg');
       },
       /*  图片保存  */
       //最终表格判定
-      judgeForm(){
-        let that = this ,
+      judgeForm() {
+        let that = this,
           reg = /\{(.+?)\}/g,
           judgeList = this.judgeList;
-        for(let i=0;i<judgeList.length;i++){
-          let arr = [],str = '';
-          let item = judgeList[i].rule_expression.replace(/`/g,'');
-          if(item.indexOf('||')>-1){
+        for (let i = 0; i < judgeList.length; i++) {
+          let arr = [], str = '';
+          let item = judgeList[i].rule_expression.replace(/`/g, '');
+          if (item.indexOf('||') > -1) {
             arr = item.split('||');
-          }else if(item.indexOf('&&')>-1){
+          } else if (item.indexOf('&&') > -1) {
             arr = item.split('&&');
-          }else{
+          } else {
             arr.push(item);
           }
           //对每个条件进行判定，如果符合，
-          for (let i = 0;i<arr.length;i++){
+          for (let i = 0; i < arr.length; i++) {
             //获取判断依据
-            let a = '`'+ arr[i]+'`';
-            let tem =a.match(reg)[0];
+            let a = '`' + arr[i] + '`';
+            let tem = a.match(reg)[0];
             let ky = tem.replace(/\{|\}/g, '');//qipao
             //有值时进行判断
-            if(that.checkForm[ky]!==''&&that.checkForm[ky]!==null&&that.checkForm[ky]!==undefined){
+            if (that.checkForm[ky] !== '' && that.checkForm[ky] !== null && that.checkForm[ky] !== undefined) {
               //替换变量
               a = a.replace(ky, 'yyy');
-              let yyy = "'"+that.checkForm[ky]+"'";
-              if(eval(eval( a))){
+              let yyy = "'" + that.checkForm[ky] + "'";
+              if (eval(eval(a))) {
                 str += 'true';
-              }else{
+              } else {
                 str += 'false';
               }
             }
           }
-          if(item.indexOf('&&')>-1){
-            if(str.indexOf('false')>-1){
+          if (item.indexOf('&&') > -1) {
+            if (str.indexOf('false') > -1) {
               that.judgeList[i].is_testok = true;
-            }else{
+            } else {
               that.judgeList[i].is_testok = false;
             }
-          }else{
-           if(str.indexOf('true')>-1){
+          } else {
+            if (str.indexOf('true') > -1) {
               that.judgeList[i].is_testok = false;
-            }else{
+            } else {
               that.judgeList[i].is_testok = true;
             }
           }
         }
-        let real = that.judgeList.filter(item=>{
-          return item.is_testok===false;
+        let real = that.judgeList.filter(item => {
+          return item.is_testok === false;
         });
-        if(real.length>0){
+        if (real.length > 0) {
           that.is_testok = false;
           // alert("检验不合格！")
-        }else{
+        } else {
           that.is_testok = true;
           // alert("检验合格！")
         }
@@ -671,12 +673,12 @@
       submitfield(isSubmit) {
         let that = this;
         that.index = isSubmit;
-        let drawArr = that.formData.filter(item=>{
-          return item.field_type==='draw';
+        let drawArr = that.formData.filter(item => {
+          return item.field_type === 'draw';
         });
-        if(drawArr.length>0){
-          that.word.style.display="none";
-          that.Txt.style.display="none";
+        if (drawArr.length > 0) {
+          that.word.style.display = "none";
+          that.Txt.style.display = "none";
           let canvas = document.getElementById('canvas');
           let image = new Image();
           image = canvas.toDataURL('image/png');
@@ -685,27 +687,27 @@
           let formData = new FormData();
           formData.append('file', file);
           upFile(formData).then((res) => {
-            if(res){
+            if (res) {
               let key = drawArr[0].field_key;
-              that.imgUrl=res.data.path;
+              that.imgUrl = res.data.path;
               that.checkForm[key] = res.data.path;
               that.fieldData();
             }
           });
-        }else{
+        } else {
           that.fieldData();
         }
       },
-      fieldData(){
+      fieldData() {
         let that = this;
         that.field = []; //检查项目
         that.formData.forEach((item) => {
           let field_value;
-          if(item.field_type==='int'){
+          if (item.field_type === 'int') {
             field_value = parseInt(that.checkForm[item.field_key])
-          }else if(item.field_type==='float'){
+          } else if (item.field_type === 'float') {
             field_value = parseFloat(that.checkForm[item.field_key])
-          }else{
+          } else {
             field_value = that.checkForm[item.field_key];
           }
           that.field.push({
@@ -718,14 +720,14 @@
         that.testrecord.record_data = that.field;//检查项列表
         that.testrecord.is_testok = that.is_testok;//检查表检查结果
         that.testrecord.id = that.recordId;//记录id
-        if(that.index==='2'){//提交
-          this.$emit('recordSubmit',that.testrecord);
-        }else {//保存
-          this.$emit('recordSave',that.testrecord);
+        if (that.index === '2') {//提交
+          this.$emit('recordSubmit', that.testrecord);
+        } else {//保存
+          this.$emit('recordSave', that.testrecord);
         }
       },
-      recordCancel(){
-        this.$emit('recordCancel','')
+      recordCancel() {
+        this.$emit('recordCancel', '')
       },
     }
   }
@@ -733,7 +735,7 @@
 
 <style scoped>
   canvas {
-    width:500px!important;
+    width: 500px !important;
     /*border: 1px solid #000000;*/
     cursor: crosshair;
     margin: auto;
@@ -757,6 +759,7 @@
     margin-right: 10px;
     margin-bottom: 10px;
   }
+
   .hide {
     display: none;
   }
@@ -795,23 +798,33 @@
   #res {
     display: inline-block;
   }
-  .helpText{
+
+  .helpText {
     position: absolute;
     top: 40px;
     left: 100px;
   }
-  .adoptTip{
+
+  .adoptTip {
     position: absolute;
     top: 38px;
     right: 0;
     font-size: 12px;
     color: #46ce7a;
   }
-  .failTip{
+
+  .failTip {
     position: absolute;
     top: 38px;
     right: 0;
     font-size: 12px;
     color: #ff0000;
   }
+  #canvasImg{
+    width:500px;
+    height: 300px;
+    position: absolute;
+    left: 50%;
+    transform: translateX(-50%)
+  }
 </style>

From 997591479e764d856316d8aeb84635f99f54f059 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Wed, 25 May 2022 16:45:21 +0800
Subject: [PATCH 7/9] 0525bugFixed

---
 hb_client/src/components/customForm/index.vue  | 1 -
 hb_client/src/components/customForm/review.vue | 6 +++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/hb_client/src/components/customForm/index.vue b/hb_client/src/components/customForm/index.vue
index b01f50e..ae2d0c0 100644
--- a/hb_client/src/components/customForm/index.vue
+++ b/hb_client/src/components/customForm/index.vue
@@ -436,7 +436,6 @@
       },
       //画布添加背景模板图
       draw() {
-        debugger;
         this.ctx = document.getElementById('canvas').getContext('2d');
         let canvasImg = document.getElementById("canvasImg");
         // canvasImg.setAttribute("crossOrigin", 'anonymous');
diff --git a/hb_client/src/components/customForm/review.vue b/hb_client/src/components/customForm/review.vue
index 4265772..5dc5417 100644
--- a/hb_client/src/components/customForm/review.vue
+++ b/hb_client/src/components/customForm/review.vue
@@ -329,8 +329,8 @@
       });
       that.img = new Image();
       that.img.crossOrigin = '';
-      that.img = imag[0].field_value;
-      that.originImg = imag[0].origin_value;
+      that.img = process.env.VUE_APP_BASE_API.replace('/api','')+imag[0].field_value;
+      that.originImg = process.env.VUE_APP_BASE_API.replace('/api','')+ imag[0].origin_value;
       listJudge.forEach(item => {
         let obj = new Object();
         obj = item;
@@ -383,7 +383,7 @@
         let that = this;
         if(rule!==''&&rule!==null&&rule!==undefined){
           let reg = /\{(.+?)\}/g;
-          debugger;
+          // debugger;
           if(rule.indexOf('||')>-1||rule.indexOf('&&')>-1){
             let tam = '', arr = [];
             if(rule.indexOf('||')>-1){

From 392ddf83cd11988b5fa79de81a779791a3424550 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Thu, 26 May 2022 09:02:46 +0800
Subject: [PATCH 8/9] 0525bugFixed

---
 hb_client/src/views/mtm/step.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hb_client/src/views/mtm/step.vue b/hb_client/src/views/mtm/step.vue
index 536a9bf..fcd78d3 100644
--- a/hb_client/src/views/mtm/step.vue
+++ b/hb_client/src/views/mtm/step.vue
@@ -388,7 +388,7 @@
                   <el-input
                     v-model="field.field_key"
                     placeholder="字段标识"
-                    onkeyup="value=value.replace(/[^0-9A-Za-z_\/]/ig,'')"
+                    onkeyup="value=value.replace(/[^0-9A-Za-z]/g,'')"
                   />
                 </el-form-item>
                 <el-form-item label="字段名称" prop="field_name">

From db4adb4756e0940976b58ceeab7390feabdea67e Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Fri, 27 May 2022 15:35:15 +0800
Subject: [PATCH 9/9] picture

---
 hb_client/src/components/customForm/index.vue   | 2 +-
 hb_client/src/views/mtm/step.vue                | 1 +
 hb_client/src/views/procurement/puorderitem.vue | 6 ++++++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/hb_client/src/components/customForm/index.vue b/hb_client/src/components/customForm/index.vue
index ae2d0c0..8eadbca 100644
--- a/hb_client/src/components/customForm/index.vue
+++ b/hb_client/src/components/customForm/index.vue
@@ -246,7 +246,7 @@
       if (imag.length > 0) {
         that.img = new Image();
         that.img.crossOrigin = 'anonymous';
-        let value = imag[0].field_value!==null ? imag[0].field_value : imag[0].draw_template;
+        let value = imag[0].field_value!==null&&imag[0].field_value!==undefined&&imag[0].field_value!=='' ? imag[0].field_value : imag[0].draw_template;
         that.img =process.env.VUE_APP_BASE_API.replace('/api','')+ value;
         setTimeout(function () {
           that.canvasInit();
diff --git a/hb_client/src/views/mtm/step.vue b/hb_client/src/views/mtm/step.vue
index fcd78d3..6deb6f1 100644
--- a/hb_client/src/views/mtm/step.vue
+++ b/hb_client/src/views/mtm/step.vue
@@ -526,6 +526,7 @@
           'datetime': '日期时间',
           'select': '单选',
           'selects': '多选',
+          'draw': '绘图模板',
         },
         typeoption: [{
           value: 1,
diff --git a/hb_client/src/views/procurement/puorderitem.vue b/hb_client/src/views/procurement/puorderitem.vue
index 7ac2299..e52e53a 100644
--- a/hb_client/src/views/procurement/puorderitem.vue
+++ b/hb_client/src/views/procurement/puorderitem.vue
@@ -30,6 +30,9 @@
         <el-table-column label="物料型号">
           <template slot-scope="scope">{{ scope.row.material_.specification }}</template>
         </el-table-column>
+        <!--<el-table-column label="物料品牌">
+          <template slot-scope="scope">{{ scope.row.brand }}</template>
+        </el-table-column>-->
         <el-table-column label="采购数量">
           <template slot-scope="scope">{{ scope.row.count }}</template>
         </el-table-column>
@@ -90,6 +93,9 @@
             </el-option>
           </el-select>
         </el-form-item>
+        <!--<el-form-item label="物料品牌">
+          <el-input v-model="puorderTtem.brand" placeholder="规格型号"/>
+        </el-form-item>-->
       </el-form>
       <div style="text-align: right">
         <el-button type="danger" @click="dialogVisible = false">取消</el-button>