From 02a27daf6fc9313c503b7886cf30868329b69389 Mon Sep 17 00:00:00 2001
From: shilixia <2309368887@qq.com>
Date: Tue, 16 Nov 2021 14:21:02 +0800
Subject: [PATCH] fenye

---
 hb_client/src/views/mtm/materialdo.vue | 12 +++++-------
 hb_client/src/views/mtm/step.vue       | 11 ++++++++++-
 hb_client/src/views/wpm/need.vue       | 19 ++++++++++++++++++-
 3 files changed, 33 insertions(+), 9 deletions(-)

diff --git a/hb_client/src/views/mtm/materialdo.vue b/hb_client/src/views/mtm/materialdo.vue
index 3cb531e..78bafdc 100644
--- a/hb_client/src/views/mtm/materialdo.vue
+++ b/hb_client/src/views/mtm/materialdo.vue
@@ -216,6 +216,7 @@
                   scope.row.field_key
                 }}</template>
               </el-table-column>
+              <!--
               <el-table-column label="上限值">
                 <template slot-scope="scope">{{
                   scope.row.high_limit
@@ -236,6 +237,7 @@
                   {{ lowoptionss_[scope.row.low_rule] }}</template
                 >
               </el-table-column>
+              !-->
               <el-table-column label="是否判定">
                 <template slot-scope="scope">
                   <el-tag v-if="scope.row.need_judge == true">是</el-tag>
@@ -399,14 +401,10 @@
 
 !-->
 
+
+
                 <el-form-item label="表达式"  v-if="field.need_judge == true">
-                  <vue-json-editor
-                    :mode="'code'"
-                    lange="zh"
-                    v-model="field.rule_expression"
-                  >
-                   
-                  </vue-json-editor>
+                 <el-input v-model="field.rule_expression" type="textarea"/>
                 </el-form-item>
 
                 <el-form-item label="排序" prop="sort">
diff --git a/hb_client/src/views/mtm/step.vue b/hb_client/src/views/mtm/step.vue
index b8569f3..1280673 100644
--- a/hb_client/src/views/mtm/step.vue
+++ b/hb_client/src/views/mtm/step.vue
@@ -327,6 +327,13 @@
               </el-table-column>
 
             </el-table>
+              <pagination
+        v-show="fieldList.count > 0"
+        :total="fieldList.count"
+        :page.sync="listQueryfield.page"
+        :limit.sync="listQueryfield.page_size"
+        @pagination="fieldLists"
+      />
             <el-dialog :visible.sync="dialogVisible1" :title="dialogType1 === 'edit' ? '编辑表格字段' : '新增表格字段'">
               <el-form ref="Form" :model="field" label-width="80px" label-position="right">
                 <el-form-item label="字段类型" prop="field_type">
@@ -404,7 +411,9 @@
         stepList:[],
         upHeaders: upHeaders(),
         upUrl: upUrl(),
-        fileList:[],
+        fileList:{
+        count: 0,
+      },
         listLoading: true,
         dialogVisibles: false,
         dialogVisibleForm: false,
diff --git a/hb_client/src/views/wpm/need.vue b/hb_client/src/views/wpm/need.vue
index f1eea65..35ccf65 100644
--- a/hb_client/src/views/wpm/need.vue
+++ b/hb_client/src/views/wpm/need.vue
@@ -42,9 +42,18 @@
         </el-table-column>
 
         <el-table-column label="半成品编号">
-          <template slot-scope="scope">{{ scope.row.m_state_.number }}</template>
+          <template slot-scope="scope">{{ scope.row.number }}</template>
+        </el-table-column>
+        <el-table-column label="检测状态">
+          <template slot-scope="scope">
+             {{actstate_[scope.row.act_state]}}
+          </template>
         </el-table-column>
        
+      <el-table-column label="所在子工序">
+          <template slot-scope="scope">{{ scope.row.p_state_.name }}</template>
+        </el-table-column>
+
         <el-table-column align="center" label="操作" width="220px">
           <template slot-scope="scope">
             <el-link
@@ -125,6 +134,14 @@ export default {
         page: 1,
         page_size: 20,
       },
+      actstate_:{
+        
+        
+        1:'生产中',
+        2:'待检测',
+        3:'已合格',
+        4:'库存中',
+      },
       options: [],
       listLoading: true,
       dialogVisible: false,