From 637118b28c2a54b43ebd1f90c60421117d1f0f30 Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Mon, 27 May 2024 09:33:30 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E7=8F=AD=E7=BB=84=E3=80=81?=
 =?UTF-8?q?=E7=A7=91=E7=9B=AE=E3=80=81=E5=B7=A5=E7=A7=8D=E3=80=81=E4=BE=9B?=
 =?UTF-8?q?=E5=BA=94=E5=95=86=E7=AD=89=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../profession/profession.vue                 | 60 ++++++++++++-------
 .../basicinformation/subjects/subjects.vue    | 60 ++++++++++++-------
 .../basicinformation/supplier/supplier.vue    | 27 ++++++---
 .../src/views/basicinformation/team/team.vue  | 54 +++++++++++------
 4 files changed, 133 insertions(+), 68 deletions(-)

diff --git a/yxt-as-ui/src/views/basicinformation/profession/profession.vue b/yxt-as-ui/src/views/basicinformation/profession/profession.vue
index 90438de050..4cd39267f5 100644
--- a/yxt-as-ui/src/views/basicinformation/profession/profession.vue
+++ b/yxt-as-ui/src/views/basicinformation/profession/profession.vue
@@ -29,13 +29,9 @@
           <el-table :key="tableKey" v-loading="listLoading" :data="list" :border="true" style="width: 100%;" @selection-change="handleSelectionChange">
             <el-table-column type="selection" align="center" width="50"/>
             <el-table-column label="序号" type="index" width="80" :index="indexMethod" align="center"/>
-            <el-table-column label="操作" width="180px" align="center">
-              <template slot-scope="scope">
-                <el-button type="primary" size="mini" @click="toEdit(scope.row)">编辑</el-button>
-              </template>
-            </el-table-column>
             <el-table-column prop="sortNo" label="排序" align="center" />
             <el-table-column prop="serviceTypeName" label="类别名称" align="center" />
+            <el-table-column prop="serviceTypeCode" label="类别编码" align="center" />
             <el-table-column prop="percentageRate" label="提成比例" align="center" />
             <el-table-column prop="percentageAmount" label="提成金额" align="center" />
             <el-table-column prop="createOrgName" label="门店" align="center" />
@@ -51,15 +47,15 @@
       </div>
     </div>
     <el-dialog center :visible.sync="dialogVisible" width="70%">
-      <el-form ref="form_obj" :model="formobj" class="formaddcopy02">
+      <el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
         <el-row style="border-top: 1px solid #E0E3EB">
           <el-col :span="12">
-            <div class="span-sty">类别名称</div>
-            <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.serviceTypeName" clearable placeholder="" /></el-form-item>
+            <div class="span-sty"><span class="icon">*</span>类别名称</div>
+            <el-form-item prop="serviceTypeName"><el-input class="addinputInfo addinputw" v-model="formobj.serviceTypeName" clearable placeholder="" /></el-form-item>
           </el-col>
           <el-col :span="12">
-            <div class="span-sty">类别编码</div>
-            <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.serviceTypeCode" clearable placeholder="" /></el-form-item>
+            <div class="span-sty"><span class="icon">*</span>类别编码</div>
+            <el-form-item prop="serviceTypeCode"><el-input class="addinputInfo addinputw" v-model="formobj.serviceTypeCode" clearable placeholder="" /></el-form-item>
           </el-col>
         </el-row>
         <el-row>
@@ -74,8 +70,8 @@
         </el-row>
         <el-row>
           <el-col :span="24">
-            <div class="span-sty">排序</div>
-            <el-form-item><el-input class="addinputInfo addinputw" @keyup.native="formobj.sortNo = getNumber(formobj.sortNo, 0)" v-model="formobj.sortNo" clearable placeholder="" /></el-form-item>
+            <div class="span-sty"><span class="icon">*</span>排序</div>
+            <el-form-item prop="sortNo"><el-input class="addinputInfo addinputw" @keyup.native="formobj.sortNo = getNumber(formobj.sortNo, 0)" v-model="formobj.sortNo" clearable placeholder="" /></el-form-item>
           </el-col>
         </el-row>
       </el-form>
@@ -113,6 +109,11 @@ export default {
         percentageAmount: '',
         percentageRate: ''
       },
+      rules: {
+        serviceTypeName: [{ required: true, message: '类别名称不能为空', trigger: 'blur' }],
+        serviceTypeCode: [{ required: true, message: '类别编码不能为空', trigger: 'blur' }],
+        sortNo: [{ required: true, message: '排序不能为空', trigger: 'blur' }]
+      },
       btndisabled: false,
       btnList: [
         {
@@ -122,6 +123,13 @@ export default {
           btnKey: 'toAdd',
           btnLabel: '新增'
         },
+        {
+          type: 'primary',
+          size: 'small',
+          icon: 'edit',
+          btnKey: 'toEdit',
+          btnLabel: '编辑'
+        },
         {
           type: 'danger',
           size: 'small',
@@ -147,7 +155,7 @@ export default {
       // 翻页
       listQuery: {
         current: 1,
-        size: 10,
+        size: 5,
         total: 0,
         params: {
           orgPath: '',
@@ -180,6 +188,9 @@ export default {
         case 'toAdd':
           this.toAdd()
           break
+        case 'toEdit':
+          this.toEdit()
+          break
         case 'doDel':
           this.doDel()
           break
@@ -228,7 +239,7 @@ export default {
     handleReset() {
       this.listQuery = {
         current: 1,
-        size: 10,
+        size: 5,
         total: 0,
         params: {
           orgPath: '',
@@ -259,13 +270,17 @@ export default {
       }
       return val
     },
-    toEdit(row) {
-      this.dialogVisible = true
-      req.fetchBySid(row.sid).then((res) => {
-        if (res.success) {
-          this.formobj = res.data
-        }
-      })
+    toEdit() {
+      if (this.sids.length === 1) {
+        this.dialogVisible = true
+        req.fetchBySid(this.sids[0]).then((res) => {
+          if (res.success) {
+            this.formobj = res.data
+          }
+        })
+      } else {
+        this.$message({ showClose: true, type: 'error', message: '请选择一条记录进行操作' })
+      }
     },
     handleConfirm() {
       this.formobj.createBySid = window.sessionStorage.getItem('userSid')
@@ -339,6 +354,9 @@ export default {
 .addinputInfo {
   margin-left: 75px !important;
 }
+/deep/ .el-form-item__error {
+  margin-left: 75px !important;
+}
 .formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw {
   margin-left: 75px !important;
   width: calc(100% - 70px);
diff --git a/yxt-as-ui/src/views/basicinformation/subjects/subjects.vue b/yxt-as-ui/src/views/basicinformation/subjects/subjects.vue
index dcb3218206..00f7a8f8c1 100644
--- a/yxt-as-ui/src/views/basicinformation/subjects/subjects.vue
+++ b/yxt-as-ui/src/views/basicinformation/subjects/subjects.vue
@@ -29,12 +29,8 @@
           <el-table :key="tableKey" v-loading="listLoading" :data="list" :border="true" style="width: 100%;" @selection-change="handleSelectionChange">
             <el-table-column type="selection" align="center" width="50"/>
             <el-table-column label="序号" type="index" width="80" :index="indexMethod" align="center"/>
-            <el-table-column label="操作" width="180px" align="center">
-              <template slot-scope="scope">
-                <el-button type="primary" size="mini" @click="toEdit(scope.row)">编辑</el-button>
-              </template>
-            </el-table-column>
             <el-table-column prop="subjectName" label="科目名称" align="center" />
+            <el-table-column prop="subjectCode" label="科目编码" align="center" />
             <el-table-column prop="subjectType" label="类型" align="center" />
             <el-table-column prop="sortNo" label="排序" align="center" />
             <el-table-column prop="createOrgName" label="门店" align="center" />
@@ -50,15 +46,15 @@
       </div>
     </div>
     <el-dialog :visible.sync="dialogVisible" width="70%">
-      <el-form ref="form_obj" :model="formobj" class="formaddcopy02">
+      <el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
         <el-row style="border-top: 1px solid #E0E3EB">
           <el-col :span="12">
-            <div class="span-sty">科目名称</div>
-            <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.subjectName" clearable placeholder="" /></el-form-item>
+            <div class="span-sty"><span class="icon">*</span>科目名称</div>
+            <el-form-item prop="subjectName"><el-input class="addinputInfo addinputw" v-model="formobj.subjectName" clearable placeholder="" /></el-form-item>
           </el-col>
           <el-col :span="12">
-            <div class="span-sty">科目编码</div>
-            <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.subjectCode" clearable placeholder="" /></el-form-item>
+            <div class="span-sty"><span class="icon">*</span>科目编码</div>
+            <el-form-item prop="subjectCode"><el-input class="addinputInfo addinputw" v-model="formobj.subjectCode" clearable placeholder="" /></el-form-item>
           </el-col>
         </el-row>
         <el-row>
@@ -67,8 +63,8 @@
             <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.subjectType" clearable placeholder="" /></el-form-item>
           </el-col>
           <el-col :span="12">
-            <div class="span-sty">排序</div>
-            <el-form-item><el-input class="addinputInfo addinputw" @keyup.native="formobj.sortNo = getNumber(formobj.sortNo, 0)" v-model="formobj.sortNo" clearable placeholder="" /></el-form-item>
+            <div class="span-sty"><span class="icon">*</span>排序</div>
+            <el-form-item prop="sortNo"><el-input class="addinputInfo addinputw" @keyup.native="formobj.sortNo = getNumber(formobj.sortNo, 0)" v-model="formobj.sortNo" clearable placeholder="" /></el-form-item>
           </el-col>
         </el-row>
       </el-form>
@@ -107,6 +103,11 @@ export default {
         createOrgSid: '',
         createBySid: ''
       },
+      rules: {
+        subjectName: [{ required: true, message: '科目名称不能为空', trigger: 'blur' }],
+        subjectCode: [{ required: true, message: '科目编码不能为空', trigger: 'blur' }],
+        sortNo: [{ required: true, message: '排序不能为空', trigger: 'blur' }]
+      },
       btndisabled: false,
       btnList: [
         {
@@ -116,6 +117,13 @@ export default {
           btnKey: 'toAdd',
           btnLabel: '新增'
         },
+        {
+          type: 'primary',
+          size: 'small',
+          icon: 'edit',
+          btnKey: 'toEdit',
+          btnLabel: '编辑'
+        },
         {
           type: 'danger',
           size: 'small',
@@ -141,7 +149,7 @@ export default {
       // 翻页
       listQuery: {
         current: 1,
-        size: 10,
+        size: 5,
         total: 0,
         params: {
           orgPath: '',
@@ -174,6 +182,9 @@ export default {
         case 'toAdd':
           this.toAdd()
           break
+        case 'toEdit':
+          this.toEdit()
+          break
         case 'doDel':
           this.doDel()
           break
@@ -222,7 +233,7 @@ export default {
     handleReset() {
       this.listQuery = {
         current: 1,
-        size: 10,
+        size: 5,
         total: 0,
         params: {
           orgPath: '',
@@ -253,13 +264,17 @@ export default {
       }
       return val
     },
-    toEdit(row) {
-      this.dialogVisible = true
-      req.fetchBySid(row.sid).then((resp) => {
-        if (resp.success) {
-          this.formobj = resp.data
-        }
-      })
+    toEdit() {
+      if (this.sids.length === 1) {
+        this.dialogVisible = true
+        req.fetchBySid(this.sids[0]).then((resp) => {
+          if (resp.success) {
+            this.formobj = resp.data
+          }
+        })
+      } else {
+        this.$message({ showClose: true, type: 'error', message: '请选择一条记录进行操作' })
+      }
     },
     handleConfirm() {
       this.formobj.createBySid = window.sessionStorage.getItem('userSid')
@@ -334,4 +349,7 @@ export default {
 .addinputInfo {
   margin-left: 75px !important;
 }
+/deep/ .el-form-item__error {
+  margin-left: 75px !important;
+}
 </style>
diff --git a/yxt-as-ui/src/views/basicinformation/supplier/supplier.vue b/yxt-as-ui/src/views/basicinformation/supplier/supplier.vue
index ade9f0e62d..24a7aaa9de 100644
--- a/yxt-as-ui/src/views/basicinformation/supplier/supplier.vue
+++ b/yxt-as-ui/src/views/basicinformation/supplier/supplier.vue
@@ -38,9 +38,8 @@
           <el-table :key="tableKey" v-loading="listLoading" :data="list" :border="true" style="width: 100%;" @selection-change="handleSelectionChange">
             <el-table-column type="selection" align="center" width="50" />
             <el-table-column label="序号" type="index" width="80" :index="indexMethod" align="center" />
-            <el-table-column label="操作" width="180px" align="center">
+            <el-table-column label="操作" width="100" align="center">
               <template slot-scope="scope">
-                <el-button type="primary" size="mini" @click="toEdit(scope.row)">编辑</el-button>
                 <el-button type="primary" size="mini" @click="toInfo(scope.row)">查看</el-button>
               </template>
             </el-table-column>
@@ -96,6 +95,13 @@ export default {
           btnKey: 'toAdd',
           btnLabel: '新增'
         },
+        {
+          type: 'primary',
+          size: 'small',
+          icon: 'edit',
+          btnKey: 'toEdit',
+          btnLabel: '编辑'
+        },
         {
           type: 'danger',
           size: 'small',
@@ -122,7 +128,7 @@ export default {
       // 翻页
       listQuery: {
         current: 1,
-        size: 10,
+        size: 5,
         total: 0,
         params: {
           supplierName: '',
@@ -156,6 +162,9 @@ export default {
         case 'toAdd':
           this.toAdd()
           break
+        case 'toEdit':
+          this.toEdit()
+          break
         case 'doDel':
           this.doDel()
           break
@@ -203,7 +212,7 @@ export default {
     handleReset() {
       this.listQuery = {
         current: 1,
-        size: 10,
+        size: 5,
         total: 0,
         params: {
           supplierName: '',
@@ -218,9 +227,13 @@ export default {
       this.viewState = 2
       this.$refs['divAdd'].showAdd()
     },
-    toEdit(row) {
-      this.viewState = 3
-      this.$refs['divAdd'].showEdit(row)
+    toEdit() {
+      if (this.sids.length === 1) {
+        this.viewState = 3
+        this.$refs['divAdd'].showEdit({ sid: this.sids[0] })
+      } else {
+        this.$message({ showClose: true, type: 'error', message: '请选择一条记录进行操作' })
+      }
     },
     toInfo(row) {
       this.viewState = 4
diff --git a/yxt-as-ui/src/views/basicinformation/team/team.vue b/yxt-as-ui/src/views/basicinformation/team/team.vue
index 6502d23b15..b90efa3e74 100644
--- a/yxt-as-ui/src/views/basicinformation/team/team.vue
+++ b/yxt-as-ui/src/views/basicinformation/team/team.vue
@@ -29,11 +29,6 @@
           <el-table :key="tableKey" v-loading="listLoading" :data="list" :border="true" style="width: 100%;" @selection-change="handleSelectionChange">
             <el-table-column type="selection" align="center" width="50"/>
             <el-table-column label="序号" type="index" width="80" :index="indexMethod" align="center"/>
-            <el-table-column label="操作" width="180px" align="center">
-              <template slot-scope="scope">
-                <el-button type="primary" size="mini" @click="toEdit(scope.row)">编辑</el-button>
-              </template>
-            </el-table-column>
             <el-table-column prop="groupName" label="班组名称" align="center" />
             <el-table-column prop="sortNo" label="排序" align="center" />
             <el-table-column prop="createOrgName" label="门店" align="center" />
@@ -49,15 +44,15 @@
       </div>
     </div>
     <el-dialog :visible.sync="dialogVisible" width="70%">
-      <el-form ref="form_obj" :model="formobj" class="formaddcopy02">
+      <el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
         <el-row style="border-top: 1px solid #E0E3EB">
           <el-col :span="12">
-            <div class="span-sty">班组名称</div>
-            <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.groupName" clearable placeholder="" /></el-form-item>
+            <div class="span-sty"><span class="icon">*</span>班组名称</div>
+            <el-form-item prop="groupName"><el-input class="addinputInfo addinputw" v-model="formobj.groupName" clearable placeholder="" /></el-form-item>
           </el-col>
           <el-col :span="12">
-            <div class="span-sty">排序</div>
-            <el-form-item><el-input class="addinputInfo addinputw" @keyup.native="formobj.sortNo = getNumber(formobj.sortNo, 0)" v-model="formobj.sortNo" clearable placeholder="" /></el-form-item>
+            <div class="span-sty"><span class="icon">*</span>排序</div>
+            <el-form-item prop="sortNo"><el-input class="addinputInfo addinputw" @keyup.native="formobj.sortNo = getNumber(formobj.sortNo, 0)" v-model="formobj.sortNo" clearable placeholder="" /></el-form-item>
           </el-col>
         </el-row>
       </el-form>
@@ -94,6 +89,10 @@ export default {
         createOrgSid: '',
         createBySid: ''
       },
+      rules: {
+        groupName: [{ required: true, message: '班组名称不能为空', trigger: 'blur' }],
+        sortNo: [{ required: true, message: '排序不能为空', trigger: 'blur' }]
+      },
       btndisabled: false,
       btnList: [
         {
@@ -103,6 +102,13 @@ export default {
           btnKey: 'toAdd',
           btnLabel: '新增'
         },
+        {
+          type: 'primary',
+          size: 'small',
+          icon: 'edit',
+          btnKey: 'toEdit',
+          btnLabel: '编辑'
+        },
         {
           type: 'danger',
           size: 'small',
@@ -128,7 +134,7 @@ export default {
       // 翻页
       listQuery: {
         current: 1,
-        size: 10,
+        size: 5,
         total: 0,
         params: {
           orgPath: '',
@@ -161,6 +167,9 @@ export default {
         case 'toAdd':
           this.toAdd()
           break
+        case 'toEdit:
+          this.toEdit()
+          break
         case 'doDel':
           this.doDel()
           break
@@ -209,7 +218,7 @@ export default {
     handleReset() {
       this.listQuery = {
         current: 1,
-        size: 10,
+        size: 5,
         total: 0,
         params: {
           orgPath: '',
@@ -240,13 +249,17 @@ export default {
       }
       return val
     },
-    toEdit(row) {
-      this.dialogVisible = true
-      req.fetchBySid(row.sid).then((resp) => {
-        if (resp.success) {
-          this.formobj = resp.data
-        }
-      })
+    toEdit() {
+      if (this.sids.length === 1) {
+        this.dialogVisible = true
+        req.fetchBySid(this.sids[0]).then((resp) => {
+          if (resp.success) {
+            this.formobj = resp.data
+          }
+        })
+      } else {
+        this.$message({ showClose: true, type: 'error', message: '请选择一条记录进行操作' })
+      }
     },
     handleConfirm() {
       this.formobj.createBySid = window.sessionStorage.getItem('userSid')
@@ -319,4 +332,7 @@ export default {
 .addinputInfo {
   margin-left: 75px !important;
 }
+/deep/ .el-form-item__error {
+  margin-left: 75px !important;
+}
 </style>