sap特性功能修复

src/views/mes/md/propertytype/index.vue

@@ -92,6 +92,7 @@
       <el-table-column label="数据类型" width="150px" :formatter="formatDataType"/>
       <el-table-column label="约束" show-overflow-tooltip>
         <template slot-scope="{row}">
+          <div>是否必填：{{ row.required === 'Y' ? '是' : '否' }}</div>
           <div v-if="row.length != null">最大长度：{{ row.length }}</div>
           <div v-if="row.min != null">最小值：{{ row.min }}</div>
           <div v-if="row.max != null">最大值：{{ row.max }}</div>
@@ -134,12 +135,19 @@
               </el-select>
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item label="是否必填" prop="required" required>
+              <el-radio-group v-model="form.required">
+                <el-radio v-for="dict in dict.type.sys_yes_no" :key="dict.value" :label="dict.value">{{dict.label}}</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
           <el-col v-if="form.type === '1'" :span="12">
             <el-form-item label="最大长度" prop="length">
               <el-input v-model.trim.number="form.length" placeholder="请输入最大长度" clearable/>
             </el-form-item>
             <el-form-item label="正则" prop="regEx">
-              <el-input v-model.trim.number="form.regEx" placeholder="请输入正则" clearable/>
+              <el-input v-model.trim="form.regEx" placeholder="请输入正则" clearable/>
             </el-form-item>
           </el-col>
           <template v-if="['2', '3'].includes(form.type)">
@@ -167,7 +175,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="是否启用" prop="enableFlag">
+            <el-form-item label="是否启用" prop="enableFlag" required>
               <el-radio-group v-model="form.enableFlag">
                 <el-radio v-for="dict in dict.type.sys_yes_no" :key="dict.value" :label="dict.value">{{dict.label}}</el-radio>
               </el-radio-group>
@@ -206,7 +214,7 @@ export default {
       showSearch: true,
       // 总条数
       total: 0,
-      // 客户表格数据
+      // 表格数据
       list: [],
       propertyTypeOptions: [
         {label: '客户特性', value: 1},
@@ -230,6 +238,7 @@ export default {
       form: {
         id: null,
         name: null,
+        required: 'Y',
         type: null,
         length: null,
         min: null,
@@ -263,7 +272,7 @@ export default {
     this.getList();
   },
   methods: {
-    /** 查询客户列表 */
+    /** 查询列表 */
     getList() {
       this.loading = true;
       listPropertytype(this.queryParams).then(response => {
@@ -291,6 +300,7 @@ export default {
       this.form = {
         id: null,
         name: null,
+        required: 'Y',
         type: null,
         length: null,
         min: null,
@@ -322,7 +332,7 @@ export default {
     handleAdd() {
       this.reset();
       this.open = true;
-      this.title = "添加客户";
+      this.title = "添加数据类型";
       this.optType = "add";
     },
     /** 修改按钮操作 */

src/views/mes/md/sapproperty/index.vue

@@ -88,8 +88,8 @@
 
     <el-table v-loading="loading" :data="list" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" />
-      <el-table-column label="特性类型" prop="type" :formatter="formatType"/>
       <el-table-column label="特性名称" prop="name"/>
+      <el-table-column label="特性类型" prop="type" :formatter="formatType"/>
       <el-table-column label="sap属性" prop="sapField"/>
       <el-table-column label="数据类型名" prop="propertyType.name" />
       <el-table-column label="数据类型" prop="propertyType.type" :formatter="formatDataType"/>