Переглянути джерело

Merge branch 'bianww' into test-new

bianww 2 роки тому
батько
коміт
eede5683f5
1 змінених файлів з 18 додано та 6 видалено
  1. 18 6
      src/pages/main/departWorkLists/index.vue

+ 18 - 6
src/pages/main/departWorkLists/index.vue

@@ -130,13 +130,14 @@
                         :key="tableData.id"
                         border
                         size="small"
-                        style="width: 100%"
+                        style="width:100%"
                         v-loading="loading"
                     >
                         <el-table-column
                             prop="templateName"
                             show-overflow-tooltip
                             label="名称"
+                            min-width="25%"
                             align="center"
                         >
                         </el-table-column>
@@ -144,13 +145,14 @@
                             prop="createTime"
                             show-overflow-tooltip
                             label="创建时间"
-                            width="150"
+                            min-width="20%"
                             align="center"
                         />
                         <el-table-column
                             prop="createCity"
                             show-overflow-tooltip
                             label="创建科室"
+                            min-width="25%"
                             align="center"
                         >
                         </el-table-column>
@@ -158,7 +160,7 @@
                             prop="createBy"
                             show-overflow-tooltip
                             label="创建人"
-                            width="150"
+                            min-width="10%"
                             align="center"
                         >
                         </el-table-column>
@@ -166,11 +168,11 @@
                             prop="stateNm"
                             show-overflow-tooltip
                             label="状态"
-                            width="150"
+                            min-width="10%"
                             align="center"
                         >
                         </el-table-column>
-                        <el-table-column label="操作" align="center" width="150">
+                        <el-table-column label="操作" align="center"  min-width="20%">
                             <template slot-scope="scope">
                                 <el-button
                                     :disabled="scope.row.editFlag=='1'?false:true"
@@ -414,6 +416,14 @@ export default {
         async submitForm(formName) {
             let valid = await this.$refs[formName].validate().catch((err) => err);
             if (valid) {
+                let nm = this.formData.name;
+                if(""===nm.trim()){
+                    this.$message({
+                        type: "error",
+                        message: "新建失败!目录名称不能为空",
+                    });
+                    return;
+                }
                 this.$http({
                     url:"/market/mkWorkListCatalogue/add",
                     method: "post",
@@ -826,6 +836,7 @@ export default {
             //overflow-y: auto;
             //   border-left: 1px solid #ddd;
             height: calc(100vh - 220px);
+            width: calc(100% - 320px - 4%);
             .tabBoxClass {
                 height: calc(100% - 120px);
             }
@@ -836,7 +847,8 @@ export default {
 .button-list {
     padding: 30px 0 10px 0;
     display: flex;
-    //   justify-content: space-between;
+    //   justify-content: center;
+    justify-content: space-between;
 }
 
 .choice-style {