From 8fb4b2d1b0555234f9e963eddeee31ab7e72b70e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E9=A3=9E?= <lipengfei@outlook.com>
Date: Thu, 9 Apr 2020 09:58:14 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BF=85=E9=A1=BB=E8=BE=93=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/sys/resourcestotalrelation-list.vue    |  1 +
 .../modules/sys/totalconfig-add-or-update.vue      | 14 +++++++++++++-
 src/views/modules/sys/totalconfig-list.vue         |  1 +
 src/views/modules/sys/totalconfig-select-list.vue  |  1 +
 4 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/views/modules/sys/resourcestotalrelation-list.vue b/src/views/modules/sys/resourcestotalrelation-list.vue
index 487fc0e9..de1fa255 100644
--- a/src/views/modules/sys/resourcestotalrelation-list.vue
+++ b/src/views/modules/sys/resourcestotalrelation-list.vue
@@ -52,6 +52,7 @@
           <el-table-column prop="spec" label="规格" header-align="center" align="center"></el-table-column>
           <el-table-column prop="sort" label="排序" header-align="center" align="center"></el-table-column>
           <el-table-column prop="autoFlag" label="是否自动计算" :formatter="autoFlagFormatter" header-align="center" align="center"></el-table-column>
+            <el-table-column prop="mustFlag" label="是否必须输入" :formatter="autoFlagFormatter" header-align="center" align="center"></el-table-column>
           <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
             <template slot-scope="scope">
               <el-button v-if="$hasPermission('workRecord:relation:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
diff --git a/src/views/modules/sys/totalconfig-add-or-update.vue b/src/views/modules/sys/totalconfig-add-or-update.vue
index 66d5637c..cbf53e39 100644
--- a/src/views/modules/sys/totalconfig-add-or-update.vue
+++ b/src/views/modules/sys/totalconfig-add-or-update.vue
@@ -33,6 +33,14 @@
                 <el-radio label="1">是</el-radio>
             </el-radio-group>
         </el-form-item>
+        <el-form-item prop="mustFlag"
+                      label="必须输入"
+                      size="mini">
+            <el-radio-group v-model="dataForm.mustFlag">
+                <el-radio label="0">否</el-radio>
+                <el-radio label="1">是</el-radio>
+            </el-radio-group>
+        </el-form-item>
     </el-form>
     <template slot="footer">
       <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
@@ -55,7 +63,8 @@ export default {
         totalStyle: '',
         spec: '',
         sort: 0,
-        autoFlag: '0'
+        autoFlag: '0',
+        mustFlag: '0'
       }
     }
   },
@@ -76,6 +85,9 @@ export default {
         ],
         autoFlag: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        mustFlag : [
+            { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ]
       }
     }
diff --git a/src/views/modules/sys/totalconfig-list.vue b/src/views/modules/sys/totalconfig-list.vue
index 29b65cd0..f6c1268b 100644
--- a/src/views/modules/sys/totalconfig-list.vue
+++ b/src/views/modules/sys/totalconfig-list.vue
@@ -45,6 +45,7 @@
         <el-table-column prop="createdTime" label="创建时间" header-align="center" align="center"></el-table-column>
         <el-table-column prop="sort" label="排序" header-align="center" align="center"></el-table-column>
         <el-table-column prop="autoFlag" label="是否自动计算" :formatter="autoFlagFormatter" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="mustFlag" label="是否必须输入" :formatter="autoFlagFormatter" header-align="center" align="center"></el-table-column>
         <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
           <template slot-scope="scope">
             <el-button v-if="$hasPermission('workRecord:totalconfig:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
diff --git a/src/views/modules/sys/totalconfig-select-list.vue b/src/views/modules/sys/totalconfig-select-list.vue
index 756be10c..b0e6a9cb 100644
--- a/src/views/modules/sys/totalconfig-select-list.vue
+++ b/src/views/modules/sys/totalconfig-select-list.vue
@@ -55,6 +55,7 @@
             <el-table-column prop="createdTime" label="创建时间" header-align="center" align="center"></el-table-column>
             <el-table-column prop="sort" label="排序" header-align="center" align="center"></el-table-column>
             <el-table-column prop="autoFlag" label="是否自动计算" :formatter="autoFlagFormatter" header-align="center" align="center"></el-table-column>
+            <el-table-column prop="mustFlag" label="是否必须输入" :formatter="autoFlagFormatter" header-align="center" align="center"></el-table-column>
             <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
                 <template slot-scope="scope">
                     <el-button v-if="$hasPermission('workRecord:relation:select')" type="text" size="small" @click="SubmitHandle(scope.row.id)">选择</el-button>