From ab25c2b00e78a7f936a0eea6a028915c2db0e704 Mon Sep 17 00:00:00 2001
From: lihua <531456470@qq.com>
Date: Wed, 31 Jul 2019 14:21:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=A1=A8=E5=A4=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/material/audit/index.vue     | 32 ++++++-------
 src/views/material/log/LogDetail.vue   | 24 +++++-----
 src/views/material/warehouse/index.vue | 62 +++++++++++++-------------
 src/views/material/warn/index.vue      | 10 ++---
 4 files changed, 62 insertions(+), 66 deletions(-)

diff --git a/src/views/material/audit/index.vue b/src/views/material/audit/index.vue
index 0b5e8a7..d36aed0 100644
--- a/src/views/material/audit/index.vue
+++ b/src/views/material/audit/index.vue
@@ -18,10 +18,10 @@
           <el-select v-model="field" placeholder="请选择字段">
             <el-option label="操作人员" value="user_name" />
             <el-option label="物料编号" value="code" />
-            <el-option label="物料数值" value="value"/>
-            <el-option label="物料型号" value="model_num"/>
-            <el-option label="物料封装" value="packages"/>
-            <el-option label="物料位置" value="position"/>
+            <el-option label="值" value="value"/>
+            <el-option label="型号" value="model_num"/>
+            <el-option label="封装" value="packages"/>
+            <el-option label="位号" value="position"/>
             <el-option label="公司名称" value="company"/>
           </el-select>
         </el-col>
@@ -59,27 +59,23 @@
             min-width="10%"/>
           <el-table-column
             prop="num"
-            label="物料数量"
-            min-width="10%"/>
-          <el-table-column
-            prop="code"
-            label="物料编号"
+            label="数量"
             min-width="10%"/>
           <el-table-column
             prop="value"
-            label="物料数值"
+            label="值"
             min-width="10%"/>
           <el-table-column
             prop="modelNum"
-            label="物料型号"
+            label="型号"
             min-width="10%"/>
           <el-table-column
             prop="packages"
-            label="物料封装"
+            label="封装"
             min-width="10%"/>
           <el-table-column
             prop="position"
-            label="物料位置"
+            label="位号"
             min-width="10%"/>
           <el-table-column
             prop="company"
@@ -112,23 +108,23 @@
             min-width="10%"/>
           <el-table-column
             prop="num"
-            label="物料数量"
+            label="数量"
             min-width="10%"/>
           <el-table-column
             prop="value"
-            label="物料数值"
+            label="值"
             min-width="10%"/>
           <el-table-column
             prop="modelNum"
-            label="物料型号"
+            label="型号"
             min-width="10%"/>
           <el-table-column
             prop="packages"
-            label="物料封装"
+            label="封装"
             min-width="10%"/>
           <el-table-column
             prop="position"
-            label="物料位置"
+            label="位号"
             min-width="10%"/>
           <el-table-column
             prop="company"
diff --git a/src/views/material/log/LogDetail.vue b/src/views/material/log/LogDetail.vue
index e85d2c5..c1eca84 100644
--- a/src/views/material/log/LogDetail.vue
+++ b/src/views/material/log/LogDetail.vue
@@ -17,10 +17,10 @@
           <el-select v-model="field" placeholder="请选择字段">
             <el-option label="操作人员" value="user_name" />
             <el-option label="物料编号" value="code" />
-            <el-option label="物料数值" value="value"/>
-            <el-option label="物料型号" value="model_num"/>
-            <el-option label="物料封装" value="packages"/>
-            <el-option label="物料位置" value="position"/>
+            <el-option label="值" value="value"/>
+            <el-option label="型号" value="model_num"/>
+            <el-option label="封装" value="packages"/>
+            <el-option label="位号" value="position"/>
             <el-option label="公司名称" value="company"/>
           </el-select>
         </el-col>
@@ -54,25 +54,25 @@
             prop="code"
             label="物料编号"
             min-width="10%"/>
+          <el-table-column
+            prop="num"
+            label="数量"
+            min-width="10%"/>
           <el-table-column
             prop="value"
-            label="物料数值"
+            label="值"
             min-width="10%"/>
           <el-table-column
             prop="modelNum"
-            label="物料型号"
+            label="型号"
             min-width="10%"/>
           <el-table-column
             prop="packages"
-            label="物料封装"
-            min-width="10%"/>
-          <el-table-column
-            prop="num"
-            label="物料数量"
+            label="封装"
             min-width="10%"/>
           <el-table-column
             prop="position"
-            label="物料位置"
+            label="位号"
             min-width="10%"/>
           <el-table-column
             prop="company"
diff --git a/src/views/material/warehouse/index.vue b/src/views/material/warehouse/index.vue
index e468c4c..c02f7e2 100644
--- a/src/views/material/warehouse/index.vue
+++ b/src/views/material/warehouse/index.vue
@@ -6,10 +6,10 @@
         <el-col :span="3">
           <el-select v-model="field" placeholder="请选择字段">
             <el-option label="物料编号" value="code" />
-            <el-option label="物料数值" value="value"/>
-            <el-option label="物料型号" value="model_num"/>
-            <el-option label="物料封装" value="packages"/>
-            <el-option label="物料位置" value="position"/>
+            <el-option label="值" value="value"/>
+            <el-option label="型号" value="model_num"/>
+            <el-option label="封装" value="packages"/>
+            <el-option label="位号" value="position"/>
             <el-option label="公司名称" value="company"/>
             <el-option label="备注" value="description"/>
           </el-select>
@@ -74,23 +74,23 @@
             min-width="10%"/>
           <el-table-column
             prop="num"
-            label="物料数量"
+            label="数量"
             min-width="10%"/>
           <el-table-column
             prop="value"
-            label="物料数值"
+            label="值"
             min-width="10%"/>
           <el-table-column
             prop="modelNum"
-            label="物料型号"
+            label="型号"
             min-width="10%"/>
           <el-table-column
             prop="packages"
-            label="物料封装"
+            label="封装"
             min-width="10%"/>
           <el-table-column
             prop="position"
-            label="物料位置"
+            label="位号"
             min-width="10%"/>
           <el-table-column
             prop="company"
@@ -131,23 +131,23 @@
           <el-form-item label="物料编号" prop="code">
             <el-input v-model="form.code" :disabled="editVisible||subVisible" autocomplete="off" placeholder="请输入物料编号"/>
           </el-form-item>
-          <el-form-item v-if="addVisible||editVisible" label="物料数量" prop="num">
-            <el-input-number v-model="form.num" :min="0" label="请输入物料数量"/>
+          <el-form-item v-if="addVisible||editVisible" label="数量" prop="num">
+            <el-input-number v-model="form.num" :min="0" label="请输入数量"/>
           </el-form-item>
-          <el-form-item v-if="subVisible" label="物料数量" prop="num">
-            <el-input-number v-model="form.num" :min="0" :max="lastNum" label="请输入物料数量"/>
+          <el-form-item v-if="subVisible" label="数量" prop="num">
+            <el-input-number v-model="form.num" :min="0" :max="lastNum" label="请输入数量"/>
           </el-form-item>
-          <el-form-item v-if="!subVisible" label="物料数值" prop="value">
-            <el-input v-model="form.value" autocomplete="off" placeholder="请输入物料数值"/>
+          <el-form-item v-if="!subVisible" label="值" prop="value">
+            <el-input v-model="form.value" autocomplete="off" placeholder="请输入值"/>
           </el-form-item>
-          <el-form-item v-if="!subVisible" label="物料型号" prop="modelNum">
-            <el-input v-model="form.modelNum" autocomplete="off" placeholder="请输入物料型号"/>
+          <el-form-item v-if="!subVisible" label="型号" prop="modelNum">
+            <el-input v-model="form.modelNum" autocomplete="off" placeholder="请输入型号"/>
           </el-form-item>
-          <el-form-item v-if="!subVisible" label="物料封装" prop="packages">
-            <el-input v-model="form.packages" autocomplete="off" placeholder="请输入物料封装"/>
+          <el-form-item v-if="!subVisible" label="封装" prop="packages">
+            <el-input v-model="form.packages" autocomplete="off" placeholder="请输入封装"/>
           </el-form-item>
-          <el-form-item v-if="!subVisible" label="物料位置" prop="position">
-            <el-input v-model="form.position" autocomplete="off" placeholder="请输入物料位置"/>
+          <el-form-item v-if="!subVisible" label="位号" prop="position">
+            <el-input v-model="form.position" autocomplete="off" placeholder="请输入位号"/>
           </el-form-item>
           <el-form-item v-if="!subVisible" label="公司名称" prop="company">
             <el-input v-model="form.company" autocomplete="off" placeholder="请输入公司名称"/>
@@ -185,23 +185,23 @@
             min-width="10%"/>
           <el-table-column
             prop="value"
-            label="物料数值"
+            label="值"
             min-width="10%"/>
           <el-table-column
             prop="modelNum"
-            label="物料型号"
+            label="型号"
             min-width="10%"/>
           <el-table-column
             prop="packages"
-            label="物料封装"
+            label="封装"
             min-width="10%"/>
           <el-table-column
             prop="num"
-            label="物料数量"
+            label="数量"
             min-width="10%"/>
           <el-table-column
             prop="position"
-            label="物料位置"
+            label="位号"
             min-width="10%"/>
           <el-table-column
             prop="company"
@@ -243,19 +243,19 @@ export default {
           { required: true, message: '物料编号不能为空', trigger: 'blur' }
         ],
         value: [
-          { required: true, message: '物料数值不能为空', trigger: 'blur' }
+          { required: true, message: '值不能为空', trigger: 'blur' }
         ],
         modelNum: [
-          { required: true, message: '物料型号不能为空', trigger: 'blur' }
+          { required: true, message: '型号不能为空', trigger: 'blur' }
         ],
         packages: [
-          { required: true, message: '物料封装不能为空', trigger: 'blur' }
+          { required: true, message: '封装不能为空', trigger: 'blur' }
         ],
         num: [
-          { type: 'number', required: true, message: '请输入物料数量', trigger: 'blur' }
+          { type: 'number', required: true, message: '请输入数量', trigger: 'blur' }
         ],
         position: [
-          { required: true, message: '物料位置不能为空', trigger: 'blur' }
+          { required: true, message: '位号不能为空', trigger: 'blur' }
         ],
         company: [
           { required: true, message: '公司名称不能为空', trigger: 'blur' }
diff --git a/src/views/material/warn/index.vue b/src/views/material/warn/index.vue
index 0785531..d191eca 100644
--- a/src/views/material/warn/index.vue
+++ b/src/views/material/warn/index.vue
@@ -18,7 +18,7 @@
             min-width="10%"/>
           <el-table-column
             prop="num"
-            label="物料数量"
+            label="数量"
             min-width="10%"/>
           <el-table-column
             prop="baseNum"
@@ -26,19 +26,19 @@
             min-width="10%"/>
           <el-table-column
             prop="value"
-            label="物料数值"
+            label="值"
             min-width="10%"/>
           <el-table-column
             prop="modelNum"
-            label="物料型号"
+            label="型号"
             min-width="10%"/>
           <el-table-column
             prop="packages"
-            label="物料封装"
+            label="封装"
             min-width="10%"/>
           <el-table-column
             prop="position"
-            label="物料位置"
+            label="位号"
             min-width="10%"/>
           <el-table-column
             prop="company"