From 476c316b47296f6c198ad362c35e974a1e1a1a66 Mon Sep 17 00:00:00 2001
From: dimengzhe <251008545@qq.com>
Date: Fri, 6 Jan 2023 10:03:48 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=A7=A3=E5=BC=80=E7=99=BB=E5=BD=95?=
 =?UTF-8?q?=E9=AA=8C=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/yxt/anrui/portal/biz/sysuser/SysUserRest.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserRest.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserRest.java
index ec58f4d95e..3e58488482 100644
--- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserRest.java
+++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserRest.java
@@ -326,7 +326,7 @@ public class SysUserRest implements SysUserFeign {
         String captcha = redisUtil.get(uuid);
         List<Map> list = JSONObject.parseArray(captcha, Map.class);
 
-        /*if (StringUtils.isEmpty(verifyCode)) {
+        if (StringUtils.isEmpty(verifyCode)) {
             return new ResultBean<SysUserVo>().fail().setMsg("验证码不能为空");
         }
 
@@ -391,7 +391,7 @@ public class SysUserRest implements SysUserFeign {
             isCorrect = true;
         } else {
             return new ResultBean<SysUserVo>().fail().setMsg("验证码错误");
-        }*/
+        }
         if (StringUtils.isBlank(userName)) {
             return new ResultBean<SysUserVo>().fail().setMsg("用户名不能为空");
         }

From 4510635424caf9c9cee6b7e907ee0cb7f371aca1 Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Fri, 6 Jan 2023 15:42:51 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E9=87=87=E8=B4=AD=E7=B3=BB=E7=BB=9F?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/api/jichuxinxi/dictcommons.js         |  17 ++
 .../purchasingsystem/purchasingsystem.js      |  41 +++
 anrui-base/anrui-base-ui/src/router/index.js  |  18 +-
 .../views/caigouxitong/purchasingsystem.vue   | 283 ++++++++++++++++++
 .../caigouxitong/purchasingsystemAdd.vue      | 170 +++++++++++
 5 files changed, 527 insertions(+), 2 deletions(-)
 create mode 100644 anrui-base/anrui-base-ui/src/api/system/purchasingsystem/purchasingsystem.js
 create mode 100644 anrui-base/anrui-base-ui/src/views/caigouxitong/purchasingsystem.vue
 create mode 100644 anrui-base/anrui-base-ui/src/views/caigouxitong/purchasingsystemAdd.vue

diff --git a/anrui-base/anrui-base-ui/src/api/jichuxinxi/dictcommons.js b/anrui-base/anrui-base-ui/src/api/jichuxinxi/dictcommons.js
index 67a9ac0e5c..e753d29f43 100644
--- a/anrui-base/anrui-base-ui/src/api/jichuxinxi/dictcommons.js
+++ b/anrui-base/anrui-base-ui/src/api/jichuxinxi/dictcommons.js
@@ -25,3 +25,20 @@ export function selectByZjcAndUseOrgIsNull() {
     method: 'get'
   })
 }
+
+// 获取分公司
+export function getListOrg(data) {
+  return request({
+    url: '/portal/v1/sysorganization/getListOrg',
+    method: 'get',
+    params: data
+  })
+}
+
+// 根据分公司Sid获取分公司下所有的部门
+export function getListDeptByOrgSid(data) {
+  return request({
+    url: '/portal/v1/sysorganization/getListDeptByOrgSid/' + data,
+    method: 'GET'
+  })
+}
diff --git a/anrui-base/anrui-base-ui/src/api/system/purchasingsystem/purchasingsystem.js b/anrui-base/anrui-base-ui/src/api/system/purchasingsystem/purchasingsystem.js
new file mode 100644
index 0000000000..3d65ffd94b
--- /dev/null
+++ b/anrui-base/anrui-base-ui/src/api/system/purchasingsystem/purchasingsystem.js
@@ -0,0 +1,41 @@
+import request from '@/utils/request'
+import qs from 'qs'
+
+// 根据条件分页查询数据的列表 已改
+export function pagerList(data) {
+  return request({
+    url: '/base/v1/basepurchasesystem/listPage',
+    data: data,
+    method: 'post',
+    headers: { 'Content-Type': 'application/json' }
+  })
+}
+
+// 新增保存 已改
+export function save(data) {
+  return request({
+    url: '/base/v1/basepurchasesystem/save',
+    method: 'post',
+    data: data,
+    headers: { 'Content-Type': 'application/json' }
+  })
+}
+
+// 删除 已改
+export function delBySids(data) {
+  return request({
+    url: '/base/v1/basepurchasesystem/delBySids',
+    method: 'DELETE',
+    data: data,
+    headers: { 'Content-Type': 'application/json' }
+  })
+}
+
+// 详情以及修改回显 已改
+export function fetchDetailsBySid(data) {
+  return request({
+    url: '/base/v1/basepurchasesystem/fetchDetailsBySid/' + data,
+    method: 'get',
+    params: qs.stringify(data)
+  })
+}
diff --git a/anrui-base/anrui-base-ui/src/router/index.js b/anrui-base/anrui-base-ui/src/router/index.js
index 2dc0d01e06..8878f65604 100644
--- a/anrui-base/anrui-base-ui/src/router/index.js
+++ b/anrui-base/anrui-base-ui/src/router/index.js
@@ -360,8 +360,22 @@ export const constantRoutes = [
       meta: { title: '资料清单',noCache: true, }
     }]
   },
-
-
+  // 8、采购系统
+  {
+    path: '/caigouxitong',
+    component: Layout,
+    redirect: '/caigouxitong',
+    meta: { title: '采购系统' },
+    children: [
+      {
+        path: '/caigouxitong/purchasingsystem',
+        component: () =>
+          import('@/views/caigouxitong/purchasingsystem.vue'),
+        name: 'PurchasingSystem',
+        meta: { title: '采购系统', noCache: true }
+      }
+    ]
+  },
 	{
 		path: '/404',
 		component: () =>
diff --git a/anrui-base/anrui-base-ui/src/views/caigouxitong/purchasingsystem.vue b/anrui-base/anrui-base-ui/src/views/caigouxitong/purchasingsystem.vue
new file mode 100644
index 0000000000..2c83f8d0f3
--- /dev/null
+++ b/anrui-base/anrui-base-ui/src/views/caigouxitong/purchasingsystem.vue
@@ -0,0 +1,283 @@
+<template>
+  <div class="app-container">
+    <!-- Start 列表页面 -->
+    <div v-show="viewState == 1">
+      <button-bar view-title="采购系统管理" ref="btnbar" :btndisabled="btndisabled" @btnhandle="btnHandle"/>
+      <div class="main-content">
+        <div class="searchcon">
+          <el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
+          <div v-show="isSearchShow" class="search">
+            <el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="100px" class="tab-header">
+              <el-form-item label="分公司名称">
+                <el-select v-model="listQuery.params.useOrgSid" placeholder="请选择" clearable filterable @change="changeUseOrg">
+                  <el-option v-for="item in org_list" :key="item.sid" :label="item.name" :value="item.sid"></el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="采购系统">
+                <el-input v-model="listQuery.params.purchaseSystemName" clearable placeholder=""/>
+              </el-form-item>
+            </el-form>
+            <div class="btn" style="text-align: center;">
+              <el-button type="primary" icon="el-icon-search" @click="handleFilter" size="small">查询</el-button>
+              <el-button type="primary" icon="el-icon-refresh" @click="handleReset" size="small">重置</el-button>
+            </div>
+          </div>
+        </div>
+        <div class="listtop">
+          <div class="tit">采购系统列表</div>
+          <pageye v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
+        </div>
+        <div class="">
+          <el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%;" @selection-change="handleSelectionChange">
+            <el-table-column fixed width="60" type="selection" align="center"/>
+            <el-table-column fixed width="80" label="序号" type="index" :index="indexMethod" align="center"/>
+            <el-table-column fixed label="操作" width="100px" 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 label="分公司" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.useOrgName }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="部门" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.deptName }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="采购系统" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.purchaseSystemName }}</span>
+              </template>
+            </el-table-column>
+          </el-table>
+        </div>
+        <div class="pages">
+          <!-- 翻页 -->
+          <pagination v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
+        </div>
+      </div>
+    </div>
+    <purchasingsystemAdd v-show="viewState == 2 || viewState == 3" ref="divAdd" @doback="resetState" @reloadlist="getList"/>
+  </div>
+</template>
+
+<script>
+import { pagerList, delBySids } from '@/api/system/purchasingsystem/purchasingsystem'
+import Pagination from '@/components/pagination'
+import pageye from '@/components/pagination/pageye'
+import ButtonBar from '@/components/ButtonBar'
+import purchasingsystemAdd from './purchasingsystemAdd.vue'
+import { getListOrg, getListDeptByOrgSid } from '@/api/jichuxinxi/dictcommons'
+
+export default {
+  name: 'PurchasingSystem',
+  components: {
+    Pagination,
+    pageye,
+    ButtonBar,
+    purchasingsystemAdd
+  },
+  data() {
+    return {
+      btndisabled: false,
+      btnList: [
+        {
+          type: 'primary',
+          size: 'small',
+          icon: 'plus',
+          btnKey: 'toAdd',
+          btnLabel: '新增'
+        },
+        {
+          type: 'danger',
+          size: 'small',
+          icon: 'del',
+          btnKey: 'doDel',
+          btnLabel: '删除'
+        },
+        {
+          type: 'info',
+          size: 'small',
+          icon: 'cross',
+          btnKey: 'doClose',
+          btnLabel: '关闭'
+        }
+      ],
+      isSearchShow: false,
+      searchxianshitit: '显示查询条件',
+      viewState: 1,
+      // 查询条件 -----------
+      tableKey: 0,
+      list: [],
+      sids: [],
+      org_list: [],
+      orgDept_list: [],
+      FormLoading: false,
+      listLoading: false,
+      listQuery: {
+        params: {
+          useOrgSid: '',
+          orgSidPath: '',
+          purchaseSystemName: ''
+        },
+        current: 1,
+        size: 5,
+        total: 0
+      },
+      rules: {}
+    }
+  },
+  created() {
+    this.init()
+    // 加载列表
+    this.getList()
+  },
+  mounted() {
+    this.$refs['btnbar'].setButtonList(this.btnList)
+  },
+  methods: {
+    init() {
+      getListOrg().then((resp) => {
+        if (resp.success) {
+          this.org_list = resp.data
+        }
+      })
+    },
+    // 搜索条件效果
+    clicksearchShow() {
+      this.isSearchShow = !this.isSearchShow
+      if (this.isSearchShow) {
+        this.searchxianshitit = '隐藏查询条件'
+      } else {
+        this.searchxianshitit = '显示查询条件'
+      }
+    },
+    btnHandle(btnKey) {
+      console.log('XXXXXXXXXXXXXXX    ' + btnKey)
+      switch (btnKey) {
+        case 'toAdd':
+          this.toAdd()
+          break
+        case 'doDel':
+          this.doDel()
+          break
+        case 'doClose':
+          this.doClose()
+          break
+        default:
+          break
+      }
+    },
+    // 序号
+    indexMethod(index) {
+      var pagestart = (this.listQuery.current - 1) * this.listQuery.size
+      var pageindex = index + 1 + pagestart
+      return pageindex
+    },
+    handleSelectionChange(row) {
+      const aa = []
+      row.forEach((element) => {
+        aa.push(element.sid)
+      })
+      this.sids = aa
+      console.log('sids', this.sids)
+    },
+    // 查询列表信息
+    getList() {
+      this.listLoading = true
+      this.listQuery.params.orgSidPath = window.sessionStorage.getItem('orgSidPath')
+      pagerList(this.listQuery).then((response) => {
+        this.listLoading = false
+        if (response.success) {
+          this.list = response.data.records
+          this.listQuery.total = response.data.total
+        } else {
+          this.list = []
+          this.listQuery.total = 0
+        }
+      })
+    },
+    // 查询按钮
+    handleFilter() {
+      this.listQuery.current = 1
+      this.getList()
+    },
+    handleReset() {
+      this.listQuery = {
+        params: {
+          useOrgSid: '',
+          orgSidPath: '',
+          purchaseSystemSid: ''
+        },
+        current: 1,
+        size: 5,
+        total: 0
+      }
+      this.getList()
+    },
+    changeUseOrg(value) {
+      getListDeptByOrgSid(value).then((res) => {
+        if (res.success) {
+          this.orgDept_list = res.data
+        }
+      })
+    },
+    toAdd() {
+      this.viewState = 2
+      this.$refs['divAdd'].showAdd()
+    },
+    toEdit(row) {
+      this.viewState = 3
+      this.$refs['divAdd'].showEdit(row)
+    },
+    doDel() {
+      if (this.sids.length === 0) {
+        this.$message({ showClose: true, type: 'error', message: '请选择至少一条记录进行删除操作' })
+        return
+      }
+      const tip = '请确认是否删除所选 ' + this.sids.length + ' 条记录?'
+      this.$confirm(tip, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        const loading = this.$loading({
+          lock: true,
+          text: 'Loading',
+          spinner: 'el-icon-loading',
+          background: 'rgba(0, 0, 0, 0.7)'
+        })
+        delBySids(this.sids).then(resp => {
+          if (resp.success) {
+            this.$message({ type: 'success', message: resp.msg, showClose: true })
+          }
+          this.getList()
+          loading.close()
+        }).catch(e => {
+          loading.close()
+        })
+      }).catch(() => {
+      })
+    },
+    resetState() {
+      this.viewState = 1
+    },
+    doClose() {
+      this.$store.dispatch('tagsView/delView', this.$route)
+      this.$router.go(-1)
+    }
+  }
+}
+</script>
+<style scoped>
+/*表格列设置fixed后固定列出现下边框的设置*/
+/deep/ .el-table__fixed {
+  height: 100% !important;
+}
+/*表格列设置fixed后固定列出现下边框的设置*/
+/deep/ .el-table__fixed-right {
+  height: 100% !important;
+}
+</style>
diff --git a/anrui-base/anrui-base-ui/src/views/caigouxitong/purchasingsystemAdd.vue b/anrui-base/anrui-base-ui/src/views/caigouxitong/purchasingsystemAdd.vue
new file mode 100644
index 0000000000..275ab4597a
--- /dev/null
+++ b/anrui-base/anrui-base-ui/src/views/caigouxitong/purchasingsystemAdd.vue
@@ -0,0 +1,170 @@
+<template>
+  <div class="app-container">
+    <div>
+      <!--标题按钮部分开始-->
+      <div class="tab-header webtop">
+        <!--标题-->
+        <div>{{ viewTitle }}</div>
+        <!--start 添加修改按钮-->
+        <div>
+          <el-button type="primary" size="small" :disabled="submitdisabled" @click="save()">保存
+          </el-button>
+          <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
+        </div>
+      </div>
+      <!--标题按钮部分结束-->
+      <!--Start 新增修改部分-->
+      <div class="listconadd">
+        <el-form ref="form_obj" :model="formobj" :rules="rules" class="formadd">
+          <el-row style="border-top: 1px solid #E0E3EB">
+            <el-col :span="4" class="tleftb">
+              <span>分公司</span>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item>
+                <el-select v-model="formobj.useOrgName" placeholder="请选择" clearable filterable @change="changeOrg">
+                  <el-option v-for="item in org_list" :key="item.sid" :label="item.name" :value="item.name"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="4" class="tleftb">
+              <span>部门</span>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item>
+                <el-select v-model="formobj.deptName" placeholder="请选择" clearable filterable @change="changeOrgDept">
+                  <el-option v-for="item in orgDept_list" :key="item.sid" :label="item.name" :value="item.name"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="4" class="tleftb">
+              <span>采购系统</span>
+            </el-col>
+            <el-col :span="20">
+              <el-form-item><el-input v-model="formobj.purchaseSystemName" clearable placeholder="" style="width: 20%" /></el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+    </div>
+    <!--End 添加修改部分-->
+  </div>
+</template>
+
+<script>
+import { save, fetchDetailsBySid } from '@/api/system/purchasingsystem/purchasingsystem'
+import { getListOrg, getListDeptByOrgSid } from '@/api/jichuxinxi/dictcommons'
+
+export default {
+  name: 'PurchasingSystemAdd',
+  data() {
+    return {
+      viewTitle: '',
+      index: 0,
+      tableKey: 0,
+      org_list: [],
+      orgDept_list: [],
+      // 表单数据
+      formobj: {
+        sid: '', // 一条数据的sid
+        deptName: '',
+        deptSid: '',
+        useOrgName: '',
+        useOrgSid: '',
+        purchaseSystemName: ''
+      },
+      rules: {},
+      submitdisabled: false
+    }
+  },
+  methods: {
+    init() {
+      getListOrg().then((resp) => {
+        if (resp.success) {
+          this.org_list = resp.data
+        }
+      })
+    },
+    showAdd() {
+      this.$nextTick(() => {
+        this.init()
+        this.$refs['form_obj'].clearValidate()
+      })
+      this.viewTitle = '【新增】采购系统'
+    },
+    showEdit(row) {
+      this.$nextTick(() => {
+        this.$refs['form_obj'].clearValidate()
+        this.init()
+      })
+      this.viewTitle = '【编辑】采购系统'
+      console.log('编辑回显', row.sid)
+      fetchDetailsBySid(row.sid).then((resp) => {
+        if (resp.success) {
+          this.formobj = resp.data
+          getListDeptByOrgSid(this.formobj.useOrgSid).then((res) => {
+            if (res.success) {
+              this.orgDept_list = res.data
+            }
+          })
+        }
+      }).catch((e) => {
+        this.formobj = row
+      })
+    },
+    changeOrg(value) {
+      const choose = this.org_list.filter((item) => item.name === value)
+      this.formobj.useOrgSid = choose[0].sid
+      getListDeptByOrgSid(choose[0].sid).then((res) => {
+        if (res.success) {
+          this.orgDept_list = res.data
+        }
+      })
+    },
+    changeOrgDept(value) {
+      const choose = this.orgDept_list.filter((item) => item.name === value)
+      this.formobj.deptSid = choose[0].sid
+    },
+    save() {
+      this.$refs['form_obj'].validate((valid) => {
+        if (valid) {
+          this.submitdisabled = true
+          save(this.formobj).then((resp) => {
+            if (resp.success) {
+              this.$message({ showClose: true, type: 'success', message: '保存成功' })
+              this.handleReturn('true')
+            } else {
+              this.submitdisabled = false
+            }
+          }).catch(() => {
+            this.submitdisabled = false
+          })
+        } else {
+          return false
+        }
+      })
+    },
+    // 返回（===既判断）
+    handleReturn(isreload) {
+      if (isreload === 'true') this.$emit('reloadlist')
+      // 表单数据
+      this.formobj = {
+        sid: '', // 一条数据的sid
+        deptName: '',
+        deptSid: '',
+        useOrgName: '',
+        useOrgSid: '',
+        purchaseSystemName: ''
+      }
+      this.submitdisabled = false
+      this.$refs['form_obj'].resetFields()
+      this.$emit('doback')
+    }
+  }
+}
+</script>
+<style scoped>
+</style>
+