From 85080c45de794071862fea9e319d5ab8bca64ba3 Mon Sep 17 00:00:00 2001
From: qinxianzhangyao <11053546+qinxianzhangyao@user.noreply.gitee.com>
Date: 星期四, 21 十二月 2023 17:40:43 +0800
Subject: [PATCH] qxtj

---
 src/views/system/tijian/index.vue |  146 ++++++++++++++++++++++++++++++++++--------------
 1 files changed, 104 insertions(+), 42 deletions(-)

diff --git a/src/views/system/tijian/index.vue b/src/views/system/tijian/index.vue
index 1794ad2..ce4ede2 100644
--- a/src/views/system/tijian/index.vue
+++ b/src/views/system/tijian/index.vue
@@ -14,7 +14,17 @@
               </el-form-item>
             </el-col>
             <el-col :span="7">
-              <el-form-item label="濮撳悕" prop="cusName" style="display: flex">
+              <el-form-item label="濮撳悕" prop="cusName" style="display: flex" :rules="[
+                {
+                  required: true, validator: (rule, value, callback) => {
+                    if (!form.cusName) {
+                      callback('')
+                    } else if (form.cusName) {
+                      callback()
+                    }
+
+                  }, trigger: 'blur'
+                }]">
                 <el-input v-model="form.cusName" placeholder="璇疯緭鍏ュ鍚�" :disabled="isDisabled" />
               </el-form-item>
             </el-col>
@@ -40,8 +50,19 @@
               </el-form-item>
             </el-col>
             <el-col :span="7">
-              <el-form-item label="鎬у埆" prop="cusSex" :rules="showHidden.has_sex === 'Y' ? rules.cusSex : []"
-                :required="showHidden.has_sex === 'Y'" style="display: flex">
+              <el-form-item label="鎬у埆" prop="cusSex" :rules="[
+                {
+                  required: true, validator: (rule, value, callback) => {
+                    if (!form.cusSex && showHidden.has_sex === 'Y') {
+                      callback('')
+                    } else if (showHidden.has_sex === 'N') {
+                      callback()
+                    } else if (form.cusSex && showHidden.has_sex === 'Y') {
+                      callback()
+                    }
+
+                  }, trigger: 'blur'
+                }]" style="display: flex">
                 <el-select :disabled="isDisabled" v-model="form.cusSex" placeholder="鎬у埆">
                   <el-option v-for="dict in dict.type.sys_user_sex" :key="dict.value" :label="dict.label"
                     :value="parseInt(dict.value)"></el-option>
@@ -50,8 +71,19 @@
             </el-col>
 
             <el-col :span="9">
-              <el-form-item label="璇佷欢鍙�" prop="cusIdcard" :rules="showHidden.has_idcard === 'Y' ? rules.cusIdcard : []"
-                :required="showHidden.has_idcard === 'Y'" style="display: flex">
+              <el-form-item label="璇佷欢鍙�" prop="cusIdcard" :rules="[
+                {
+                  required: true, validator: (rule, value, callback) => {
+                    if (!form.cusIdcard && showHidden.has_idcard === 'Y') {
+                      callback('')
+                    } else if (showHidden.has_idcard === 'N') {
+                      callback()
+                    } else if (form.cusIdcard && showHidden.has_idcard === 'Y') {
+                      callback()
+                    }
+
+                  }, trigger: 'blur'
+                }]" style="display: flex">
                 <span slot="label" style="display:inline-block;border-bottom: 2px solid blue;" @click="handleQuery">
                   璇佷欢鍙�
                 </span>
@@ -79,8 +111,19 @@
               </el-form-item>
             </el-col>
             <el-col :span="7">
-              <el-form-item label="鐢佃瘽" prop="cusPhone" :rules="showHidden.is_phone === 'Y' ? rules.cusPhone : []"
-                :required="showHidden.is_phone === 'Y'" style="display: flex">
+              <el-form-item label="鐢佃瘽" prop="cusPhone" :rules="[
+                {
+                  required: true, validator: (rule, value, callback) => {
+                    if (!form.cusPhone && showHidden.is_phone === 'Y') {
+                      callback('')
+                    } else if (showHidden.is_phone === 'N') {
+                      callback()
+                    } else if (form.cusPhone && showHidden.is_phone === 'Y') {
+                      callback()
+                    }
+
+                  }, trigger: 'blur'
+                }]" style="display: flex">
                 <el-input v-model="form.cusPhone" placeholder="璇疯緭鍏ヨ仈绯荤數璇�" :disabled="isDisabled" />
               </el-form-item>
             </el-col>
@@ -111,7 +154,7 @@
                 <el-input v-model="form.cusEmail" placeholder="璇疯緭鍏ラ偖绠�" :disabled="isDisabled" />
               </el-form-item>
             </el-col>
-            <el-col :span="6">
+            <el-col :span="4">
               <el-form-item label="骞撮緞  " prop="age" style="display: flex" label-width="150px
               ">
                 <el-input v-model="form.age" :disabled="isDisabled" style="padding-left: 10%" />
@@ -734,7 +777,7 @@
       activeName: "1",
       // 閬僵灞�
       loading: false,
-      labelPosition: "left",
+      labelPosition: "right",
       imageUrl: "",
       isDisabled: false,
       size: "",
@@ -1573,33 +1616,37 @@
       // this.tableData.forEach((item) => {
       //   this.fData = item.tjProjectList;
       // });
+      console.log(this.treedataList)
+      console.log(selection)
       if (selection[0]) {
         this.DataList = [];
         // this.data = JSON.parse(JSON.stringify(this.dXData));
-        selection[0].tjProjectList.forEach((selectionitem) => {
-          this.treedataList.forEach((item) => {
-            if (selectionitem.proName == item.proName) {
-              item.disabled = true;
-              item.tjProjectList = [];
-            }
-            if (item.tjProjectList) {
-              item.tjProjectList.forEach((item1) => {
-                if (selectionitem.proName == item1.proName) {
-                  item1.disabled = true;
-                  item1.tjProjectList = [];
-                }
-                if (item1.tjProjectList) {
-                  item1.tjProjectList.forEach((item2) => {
-                    if (selectionitem.proName == item2.proName) {
-                      item2.disabled = true;
-                      item2.tjProjectList = [];
-                    }
-                  });
-                }
-              });
-            }
+        if (selection[0].tjProjectList) {
+          selection[0].tjProjectList.forEach((selectionitem) => {
+            this.treedataList.forEach((item) => {
+              if (selectionitem.proName == item.proName) {
+                item.disabled = true;
+                item.tjProjectList = [];
+              }
+              if (item.tjProjectList) {
+                item.tjProjectList.forEach((item1) => {
+                  if (selectionitem.proName == item1.proName) {
+                    item1.disabled = true;
+                    item1.tjProjectList = [];
+                  }
+                  if (item1.tjProjectList) {
+                    item1.tjProjectList.forEach((item2) => {
+                      if (selectionitem.proName == item2.proName) {
+                        item2.disabled = true;
+                        item2.tjProjectList = [];
+                      }
+                    });
+                  }
+                });
+              }
+            });
           });
-        });
+        }
       } else {
         this.treedataList = JSON.parse(JSON.stringify(this.dXData));
         return;
@@ -1613,19 +1660,24 @@
       //鍏ㄩ儴濂楅
       deptTreeSelect(cusSex).then((response) => {
         this.newpacName = response.rows;
+        console.log(this.newpacName)
+        console.log(this.tableData1)
         try {
-          this.newpacName.forEach((item3) => {
-            this.tableData1.forEach((item4) => {
-              item4.list.forEach((item6) => {
-                if (item6.pacName === item3.pacName) {
-                  this.$nextTick(() => {
-                    this.$refs.tb.toggleRowSelection(item3, true);
-                  });
-                  throw Error();
-                }
+          if (this.tableData1.length >= 1) {
+            this.newpacName.forEach((item3) => {
+              this.tableData1.forEach((item4) => {
+                item4.list.forEach((item6) => {
+                  if (item6.pacName === item3.pacName) {
+                    this.$nextTick(() => {
+                      this.$refs.tb.toggleRowSelection(item3, true);
+                    });
+                    throw Error();
+                  }
+                });
               });
             });
-          });
+          }
+
         } catch (error) { }
         this.loading = false;
       });
@@ -1823,6 +1875,16 @@
         getfindTj(data).then((response) => {
           if (response.data) {
             this.feeitems = response.data;
+            if (this.feeitems.length != 0) {
+              this.$nextTick(() => {
+                this.$refs.multipleTable.toggleRowSelection(
+                  this.feeitems[0],
+                  true
+                );
+              });
+            } else {
+              this.$refs.multipleTable.clearSelection();
+            }
             this.loading = false;
           } else {
             this.feeitems = [];

--
Gitblit v1.8.0