Merge branch 'feature/workRecord' of http://121.42.41.42:7070/r/esua-epdc-admin into feature/workRecord

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>

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' }
         ]
       }
     }

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>

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>