From 32cdbdf3a30336133909ab72fbae2f9c6ec8a252 Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Thu, 6 Apr 2023 10:37:40 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=80=89=E5=85=A5?=
 =?UTF-8?q?=E9=87=87=E8=B4=AD=E8=AE=A2=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.production                              |   2 +-
 src/api/inout/erpOrder.js                    |   8 +
 src/views/inout/DialogSelectPurOrder.vue     | 543 +++++++++++++++++++
 src/views/inout/DialogSelectReceiveOrder.vue |   4 +-
 src/views/inout/IoCreateBusOrder.vue         |   4 +-
 5 files changed, 556 insertions(+), 5 deletions(-)
 create mode 100644 src/views/inout/DialogSelectPurOrder.vue

diff --git a/.env.production b/.env.production
index ea72101..51a50f6 100644
--- a/.env.production
+++ b/.env.production
@@ -7,7 +7,7 @@ ENV = 'production'
 
 #林纪裕
 # VUE_APP_BASE_API = 'http://101.43.77.55:9150/UDI_SPMS_SERVER/'
-
+# VUE_APP_BASE_API =  'http://r.jiyuudims.cloud:5004/UDI_SPMS_SERVER/'
 # 吴总测试服务器
 # VUE_APP_BASE_API = 'http://116.204.106.103:9150/UDI_SPMS_SERVER/'
 
diff --git a/src/api/inout/erpOrder.js b/src/api/inout/erpOrder.js
index cc7899a..5f3baac 100644
--- a/src/api/inout/erpOrder.js
+++ b/src/api/inout/erpOrder.js
@@ -124,6 +124,14 @@ export function addReceiveOrder(query) {
     data: query
   });
 }
+export function addPurOrder(query) {
+  return axios({
+    url: "/udiwms/inout/order/addPurOrder",
+    method: "post",
+    data: query
+  });
+}
+
 
 export function addThrOrder(query) {
   return axios({
diff --git a/src/views/inout/DialogSelectPurOrder.vue b/src/views/inout/DialogSelectPurOrder.vue
new file mode 100644
index 0000000..45ee639
--- /dev/null
+++ b/src/views/inout/DialogSelectPurOrder.vue
@@ -0,0 +1,543 @@
+<template>
+  <div>
+    <el-card>
+      <el-form :model="filterQuery" class="query-form" label-width="100px" size="mini" v-show="showSearch">
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="采购订单号">
+              <el-input v-model="filterQuery.billNo" style="width: 90%" placeholder="请输入单据号" clearable></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="采购部门">
+              <el-select v-model="filterQuery.invCode" style="width: 90%" placeholder="请选择采购部门">
+                <el-option
+                  v-for="item in invList"
+                  :key="item.name"
+                  :label="item.name"
+                  :value="item.code">
+                  <span style="float: left">{{ item.name }}</span>
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="收货仓库">
+              <el-select v-model="filterQuery.deptCode" placeholder="请选择收货仓库" style="width: 90%">
+                <el-option
+                  v-for="item in deptList"
+                  :key="item.code"
+                  :label="item.name"
+                  :value="item.code"
+                >
+                  <span style="float: left">{{ item.name }}</span>
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+
+          <el-col :span="8">
+            <el-form-item class="query-form-item" label="处理状态:">
+              <el-select v-model="filterQuery.dealStatus"
+                         placeholder="请选择处理状态"
+                         clearable
+                         style="width: 90%"
+              >
+                <el-option label="未处理" :value="0"></el-option>
+                <el-option label="已处理" :value="1"></el-option>
+                <el-option label="已作废" :value="2"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="8" v-if="showSup">
+            <el-form-item class="query-form-item" label="供应商:">
+              <el-select
+                v-model="filterQuery.supId"
+                filterable
+                remote
+                clearable="true"
+                reserve-keyword
+                placeholder="供应商"
+                :remote-method="findMethod"
+                size="mini"
+                :loading="corpLoading"
+                style="width: 90%"
+              >
+                <el-option
+                  v-for="item in fromOptions"
+                  :key="item.name"
+                  :label="item.name"
+                  :value="item.erpId"
+                >
+                  <span style="float: left">{{ item.name }}</span>
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="发布时间:">
+              <el-date-picker
+                :picker-options="pickerUpOptions"
+                v-model="auditTimes"
+                type="daterange"
+                format="yyyy 年 MM 月 dd 日"
+                style="width: 90%"
+                value-format="yyyy-MM-dd"
+                range-separator="至"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+              >
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div class="top-right-btn">
+        <el-button-group style="display:flex;">
+          <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
+          <el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
+          <el-button type="primary" icon="el-icon-search" @click="onSubmitFind">查询</el-button>
+          <el-button type="primary" icon="el-icon-check" @click="combine"
+          >确定
+          </el-button
+          >
+          <el-button type="primary" icon="el-icon-share" v-if="this.Menustatus === 1" @click="help">帮助</el-button>
+        </el-button-group>
+      </div>
+      <el-divider style="margin: 15px"></el-divider>
+
+      <el-table v-loading="loading" :data="list" style="width: 100%" border highlight-current-row="true"
+                @current-change="handleDetail">
+        <el-table-column label="序号" type="index"></el-table-column>
+        <el-table-column label="采购订单号" prop="billNo" width="150" show-overflow-tooltip></el-table-column>
+        <el-table-column label="发布时间" prop="auditTime" width="150" show-overflow-tooltip></el-table-column>
+        <el-table-column label="供应商" prop="supName" show-overflow-tooltip="true" width="180"
+                         v-if="showSup"></el-table-column>
+        <el-table-column label="处理状态" prop="emergency" width="120">
+          <template slot-scope="scope">
+            {{ dealStatus[scope.row.emergency] }}
+          </template>
+        </el-table-column>
+        <!--        <el-table-column label="创建时间" prop="createTime" width="180" show-overflow-tooltip></el-table-column>-->
+        <el-table-column label="紧急程度" prop="emergency" width="120">
+          <template slot-scope="scope">
+            {{ emergencyMap[scope.row.emergency] }}
+          </template>
+        </el-table-column>
+        <el-table-column label="到货时间" prop="arrivalTime" width="150" show-overflow-tooltip></el-table-column>
+        <el-table-column label="订单说明" prop="remark" width="180" show-overflow-tooltip></el-table-column>
+        <el-table-column label="采购部门" prop="deptName" width="150" show-overflow-tooltip></el-table-column>
+        <el-table-column label="收货仓库" prop="invName" width="150" show-overflow-tooltip></el-table-column>
+        <el-table-column label="操作" fixed="right" width="100">
+          <template slot-scope="scope">
+            <el-button type="text" size="small" @click.native.stop="newDistributionForm(scope.row)"
+            >处理
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <pagination
+        v-show="total>0"
+        :total="total"
+        :page.sync="filterQuery.page"
+        :limit.sync="filterQuery.limit"
+        @pagination="handleCurrentChange"
+      ></pagination>
+
+    </el-card>
+    <el-card class="el-card">
+      <el-table v-loading="loading" :data="detailList" style="width: 100%" border highlight-current-row="true">
+        <el-table-column label="序号" type="index" width="50"></el-table-column>
+        <el-table-column label="物资名称" prop="productName" show-overflow-tooltip width="150"></el-table-column>
+        <el-table-column label="规格型号" prop="spec" show-overflow-tooltip width="160"></el-table-column>
+        <el-table-column label="计量单位" prop="measname" show-overflow-tooltip width="100"></el-table-column>
+        <el-table-column label="计划数量" prop="planCount" width="100"></el-table-column>
+        <el-table-column label="订单数量" prop="count" width="100"></el-table-column>
+        <el-table-column label="计量单位" prop="spec" show-overflow-tooltip="true" width="100"></el-table-column>
+
+        <el-table-column label=" 生产企业
+        " prop="manufactory" show-overflow-tooltip="true" width="160"></el-table-column>
+        <el-table-column label="注册/备案号" prop="zczbhhzbapzbh" show-overflow-tooltip="true" width="160"></el-table-column>
+        <!--        <el-table-column label="注册/备案人" prop="ylqxzcrbarmc" show-overflow-tooltip="true"></el-table-column>-->
+      </el-table>
+    </el-card>
+
+  </div>
+</template>
+<script>
+import {delApply, listOrder, listOrderDetail, delOrderDetailAll} from "@/api/purchase/purOrder";
+import {selectAuthMenu} from "@/api/system/sysMenuHelp";
+import {getBasicUnitMaintains} from "@/api/basic/basicUnitMaintain";
+import {addPurOrder} from "@/api/inout/erpOrder";
+import {getInvListByUser} from "@/api/system/invWarehouse";
+import {getDeptListByUser} from "@/api/auth/authDept";
+
+
+export default {
+
+  name: "closeDialog",
+  props: {
+    data: {
+      type: Object,
+      required: true,
+    },
+    closeDialog: {
+      type: Function,
+      required: true,
+    },
+  },
+
+  data() {
+    return {
+      BASE_URL: process.env.VUE_APP_BASE_API,
+      filterQuery: {
+        billAction: null,
+        billNo: "",
+        originType: null,
+        thirdSysFk: "",
+        page: 1,
+        limit: 10,
+        corpName: null,
+        type: 1,
+        editStatus: 1,
+      },
+
+      corpLoading: false,
+      fromOptions: [],
+
+      Menustatus: null,
+      filePath: "",
+      createTimes: null,
+      auditTimes: null,
+      showSearch: true,
+      formName: null,
+      formMap: {
+        add: "新增采购订单",
+        update: "采购订单处理",
+      },
+      statusMap: {
+        1: "草稿",
+        2: "未审核",
+        3: "已审核",
+        4: "已拒绝"
+      },
+      emergencyMap: {
+        1: "普通",
+        2: "紧急",
+        3: "不紧急",
+      },
+
+      dealStatus: {
+        1: "已处理",
+        2: "未处理",
+        3: "作废",
+      },
+      showSup: false,
+      invList: {},
+      deptList: {},
+      idQuery: {},
+      editType: 1,
+      total: 0,
+      thirdSys: [],
+      thirdSysDetail: null,
+      busTypes: [],
+      originTypes: [],
+      list: [],
+      detailList: [],
+      loading: false,
+      actDateRange: [],
+      newSpDistributionVisible: false,
+      pickerOptions: {
+        shortcuts: [
+          {
+            text: "最近一周",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+          {
+            text: "最近一个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+          {
+            text: "最近三个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+        ],
+      },
+      pickerUpOptions: {
+        shortcuts: [
+          {
+            text: "最近一周",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+          {
+            text: "最近一个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+          {
+            text: "最近三个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+        ],
+      },
+    };
+  },
+
+  methods: {
+    onReset() {
+      this.$router.push({
+        path: "",
+      });
+      this.filterQuery = {
+        billNo: "",
+        thirdSysFk: "",
+        billFlag: null,
+        billAction: null,
+        startDate: null,
+        endDate: null,
+        page: 1,
+        limit: 10,
+        corpName: null,
+        type: 1,
+        editStatus: 1,
+      };
+      this.pickerOptions = [];
+      this.pickerUpOptions = [];
+      this.getList();
+    },
+
+    onSubmitFind() {
+      this.filterQuery.page = 1;
+      this.getList();
+    },
+
+    combine() {
+      if (this.$isBlank(this.currentRow.id)) {
+        return;
+      }
+      let tQuery = {
+        id: this.currentRow.id,
+      }
+      addPurOrder(tQuery)
+        .then((response) => {
+          if (response.code === 20000) {
+            this.closeDialog();
+          } else {
+            this.$message.error(response.message);
+          }
+        })
+        .catch(() => {
+        });
+    },
+
+    hideSearch() {
+      this.showSearch = !this.showSearch;
+    },
+    help() {
+      this.certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name=";
+      window.open(this.certFileUrl + this.filePath);
+    },
+    getList() {
+      if (this.createTimes != null) {
+        this.filterQuery.startDate = this.createTimes[0];
+        this.filterQuery.endDate = this.createTimes[1];
+      } else {
+        this.filterQuery.startDate = null;
+        this.filterQuery.endDate = null;
+      }
+      if (this.auditTimes != null) {
+        this.filterQuery.startAuditDate = this.auditTimes[0];
+        this.filterQuery.endAuditDate = this.auditTimes[1];
+      } else {
+        this.filterQuery.startAuditDate = null;
+        this.filterQuery.endAuditDate = null;
+      }
+      this.loading = true;
+      this.filterQuery.status = 3;
+      listOrder(this.filterQuery)
+        .then((response) => {
+          if (response.code == 20000) {
+            this.list = response.data.list || [];
+            this.total = response.data.total || 0;
+          } else {
+            this.$message.error(response.message);
+          }
+          this.loading = false;
+        })
+        .catch(() => {
+          this.loading = false;
+          this.list = [];
+          this.total = 0;
+        });
+    },
+    handleDetail(row) {
+      let query = {orderIdFk: row.id};
+      this.loading = true;
+      listOrderDetail(query) //查找该单号下的所有条码
+        .then((response) => {
+          this.detailList = response.data.list || [];
+          this.loading = false;
+        })
+        .catch(() => {
+          this.loading = false;
+          this.detailList = [];
+          this.total = 0;
+        });
+    },
+    deleteDialog(row) {
+      this.$confirm("此操作将永久删除该单据, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          delOrderDetailAll(row)
+            .then((response) => {
+              this.loading = false;
+              if (response.code == 20000) {
+                this.$message.success("删除成功");
+                this.getList();
+              } else {
+                this.$message.error(response.message);
+              }
+            })
+            .catch(() => {
+              this.loading = false;
+            });
+
+        })
+        .catch(() => {
+        });
+    },
+    handleCurrentChange(val) {
+      this.filterQuery.page = val.page;
+      this.getList();
+    },
+    selectAuthMenu() {
+      let params = {menuName: this.$route.meta.title}
+      selectAuthMenu(params).then((res) => {
+        if (res.code === 20000) {
+          this.Menustatus = res.data.status;
+          this.filePath = res.data.filePath;
+        }
+      })
+    },
+
+    findMethod(key) {
+      this.corpLoading = true;
+      this.fromOptions = [];
+      let params = {
+        key: key,
+        corpType: 2,
+        page: 1,
+        limit: 20
+      };
+      getBasicUnitMaintains(params).then((res) => {
+        this.corpLoading = false;
+        this.fromOptions = res.data.list || [];
+      }).catch(() => {
+        this.corpLoading = false;
+      })
+    },
+
+
+    getInvList() {
+      getInvListByUser().then((res) => {
+        this.invList = res.data || [];
+        this.getBusType();
+      })
+    },
+    getDeptList() {
+      getDeptListByUser().then((res) => {
+        this.deptList = res.data || [];
+      });
+    },
+    newDistributionForm(row) {
+      this.idQuery.id = '';
+      if (this.$isNotBlank(row) && this.$isNotBlank(row.id)) {
+        this.idQuery.id = row.id;
+        this.idQuery.formData = row;
+        this.formName = "update";
+      } else
+        this.formName = "add";
+      this.newSpDistributionVisible = true;
+    },
+
+  }
+  ,
+  components: {
+  }
+  ,
+  filters: {
+    statusFilterType(status) {
+      const statusMap = {
+        2: "warning",
+        3: "success",
+        4: "danger",
+      };
+      return statusMap[status];
+    }
+    ,
+  }
+  ,
+  mounted() {
+  }
+  ,
+  created() {
+
+    let supId = this.$store.getters.customerId;
+    if (supId == "110") {
+      this.showSup = true;
+    }
+
+
+    this.selectAuthMenu();
+
+    let end = new Date();
+    let start = new Date();
+    start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+    this.actDateRange = [start, end];
+    this.getList();
+    this.getInvList();
+    this.getDeptList();
+  }
+  ,
+}
+;
+</script>
+<style scoped>
+
+</style>
+
diff --git a/src/views/inout/DialogSelectReceiveOrder.vue b/src/views/inout/DialogSelectReceiveOrder.vue
index 92d3229..47a2ad4 100644
--- a/src/views/inout/DialogSelectReceiveOrder.vue
+++ b/src/views/inout/DialogSelectReceiveOrder.vue
@@ -142,7 +142,7 @@
 </template>
 
 <script>
-import {addReceiveOrder, addStockOrder, getCloudErp} from "../../api/inout/erpOrder";
+import {addPurOrder, addReceiveOrder, addStockOrder, getCloudErp} from "../../api/inout/erpOrder";
 import store from "../../store";
 import {filterAllByUser} from "@/api/system/invWarehouse";
 
@@ -319,7 +319,7 @@ export default {
       let tQuery = {
         id: this.currentRow.id,
       }
-      addReceiveOrder(tQuery)
+      addPurOrder(tQuery)
         .then((response) => {
           if (response.code === 20000) {
             this.closeDialog();
diff --git a/src/views/inout/IoCreateBusOrder.vue b/src/views/inout/IoCreateBusOrder.vue
index ead32a4..3915842 100644
--- a/src/views/inout/IoCreateBusOrder.vue
+++ b/src/views/inout/IoCreateBusOrder.vue
@@ -193,7 +193,7 @@
         ></selectThrOrder>
       </el-dialog>
       <el-dialog
-        title="选入领用单据"
+        title="选入采购订单"
         :visible.sync="selectReceiveVisible"
         :close-on-click-modal="false"
         :close-on-press-escape="false"
@@ -228,7 +228,7 @@ import {getLocalJoinByUser} from "@/api/basic/busType";
 import {selectSysParamByKey} from "@/api/param/systemParamConfig";
 
 import selectThrOrder from "./DialogSelectThrOrder";
-import selectReceiveOrderDialog from "./DialogSelectReceiveOrder";
+import selectReceiveOrderDialog from "./DialogSelectPurOrder";
 
 
 export default {

From 76a1aadc1bff4a5150c447d3afde83fb52d7f659 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Thu, 6 Apr 2023 15:25:29 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=20=E8=A7=92=E8=89=B2=E7=AE=A1=E7=90=86=20?=
 =?UTF-8?q?=E7=99=BB=E9=99=86=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/system/invWarehouse.js     |   9 ++
 src/views/myLogin.vue              |  18 ++-
 src/views/system/role/index.vue    | 200 ++++++++++++++++++++++++-----
 src/views/system/user/authUser.vue |  59 +++++++--
 4 files changed, 239 insertions(+), 47 deletions(-)

diff --git a/src/api/system/invWarehouse.js b/src/api/system/invWarehouse.js
index 8999531..f0aa990 100644
--- a/src/api/system/invWarehouse.js
+++ b/src/api/system/invWarehouse.js
@@ -243,4 +243,13 @@ export function getInvListByUser(params) {
 }
 
 
+export function selectInvById(params) {
+  return axios({
+    url: "/spms/inv/warehouse/selectInvById",
+    method: "post",
+    data: params
+  });
+}
+
+
 
diff --git a/src/views/myLogin.vue b/src/views/myLogin.vue
index 20b4459..320dc7f 100644
--- a/src/views/myLogin.vue
+++ b/src/views/myLogin.vue
@@ -20,7 +20,7 @@
         <div style="text-align: center; margin-top: 10px;margin-bottom: 15px">
           <img alt="element-logo" src="@/assets/logo/logo.png"/>
         </div>
-        <h3 class="title">供应商自助管理系统</h3>
+        <h3 class="title">用户登录</h3>
         <el-form-item prop="username" class="item" style="margin-top: -20px">
           <el-input prefix-icon="el-icon-user" placeholder="账号" name="username" autocomplete="on" v-model="loginForm.username">
             <i slot="prefix" class="el-input__icon">
@@ -67,17 +67,23 @@
     <div style="
           position: absolute;
           bottom: 0;
-          left: 50%;
-          transform: translate(-50%, -50%);
-          font-size: 12px;
+          margin-left: 36%;
+          font-size: 18px;
           color: white;
         ">
+
       <a href="http://www.xmglxp.com/" target="_blank">
-        开发单位：厦门高立新鹏软件科技有限公司 技术支持：400-990-9112
+        软件名称: 医院UDI管理系统
+      </a>
+      <a href="http://www.xmglxp.com/" target="_blank" style="margin-left: 20px; font-size: 12px">
+       开发单位：厦门高立新鹏软件科技有限公司 技术支持：400-990-9112
       </a>
-
     </div>
 
+
+
+
+
   </div>
 </template>
 
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index ef4ae92..cb67af8 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -1,36 +1,39 @@
 <template>
   <div>
     <el-card>
-      <el-form :model="queryParams" ref="queryForm" size="mini" :inline="true" v-show="showSearch">
-        <el-form-item label="角色名称:" prop="roleName">
-          <el-input
-            v-model="queryParams.roleName"
-            placeholder="请输入角色名称"
-            clearable
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-        <el-form-item label="状态:" prop="status">
-          <el-select
-            v-model="queryParams.status"
-            placeholder="请选择角色状态"
-            clearable
-          >
-            <el-option label="正常" :value="0"/>
-            <el-option label="禁用" :value="1"/>
-          </el-select>
-        </el-form-item>
-        <el-form-item>
+      <el-tabs type="border-card" >
+        <el-tab-pane>
+          <span slot="label">内部角色</span>
+          <el-form :model="queryParams" ref="queryForm" size="mini" :inline="true" v-show="showSearch">
+            <el-form-item label="角色名称:" prop="roleName">
+              <el-input
+                v-model="queryParams.roleName"
+                placeholder="请输入角色名称"
+                clearable
+                @keyup.enter.native="handleQuery"
+              />
+            </el-form-item>
+            <el-form-item label="状态:" prop="status">
+              <el-select
+                v-model="queryParams.status"
+                placeholder="请选择角色状态"
+                clearable
+              >
+                <el-option label="正常" :value="0"/>
+                <el-option label="禁用" :value="1"/>
+              </el-select>
+            </el-form-item>
+            <el-form-item>
 
-          <el-button-group>
-            <el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-            <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd">新增</el-button>
-          </el-button-group>
+              <el-button-group>
+                <el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+                <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+                <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd">新增</el-button>
+              </el-button-group>
 
-        </el-form-item>
-      </el-form>
-      <el-table v-loading="loading" :data="roleList"
+            </el-form-item>
+          </el-form>
+      <el-table v-loading="Adminloading" :data="AdminroleList"
                 @selection-change="handleSelectionChange"
                 style="width: 100%"
                 border highlight-current-row>
@@ -96,12 +99,122 @@
       </el-table>
 
       <pagination
-        v-show="total>0"
-        :total="total"
-        :page.sync="queryParams.page"
-        :limit.sync="queryParams.limit"
+        v-show="Admintotal>0"
+        :total="Admintotal"
+        :page.sync="AdminParams.page"
+        :limit.sync="AdminParams.limit"
         @pagination="getList"
       />
+        </el-tab-pane>
+
+        <el-tab-pane>
+          <span slot="label">供应商角色</span>
+          <el-form :model="queryParams" ref="queryForm" size="mini" :inline="true" v-show="showSearch">
+            <el-form-item label="角色名称:" prop="roleName">
+              <el-input
+                v-model="queryParams.roleName"
+                placeholder="请输入角色名称"
+                clearable
+                @keyup.enter.native="handleQuery"
+              />
+            </el-form-item>
+            <el-form-item label="状态:" prop="status">
+              <el-select
+                v-model="queryParams.status"
+                placeholder="请选择角色状态"
+                clearable
+              >
+                <el-option label="正常" :value="0"/>
+                <el-option label="禁用" :value="1"/>
+              </el-select>
+            </el-form-item>
+            <el-form-item>
+
+              <el-button-group>
+                <el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+                <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+                <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd">新增</el-button>
+              </el-button-group>
+
+            </el-form-item>
+          </el-form>
+          <el-table v-loading="loading" :data="roleList"
+                    @selection-change="handleSelectionChange"
+                    style="width: 100%"
+                    border highlight-current-row>
+            <el-table-column label="序号" type="index"></el-table-column>
+            <el-table-column label="角色名称" prop="roleName" :show-overflow-tooltip="true"/>
+            <!--      <el-table-column label="权限字符" prop="roleKey" :show-overflow-tooltip="true" width="150"/>-->
+            <!--      <el-table-column label="显示顺序" prop="roleSort" width="100"/>-->
+            <el-table-column label="状态">
+              <template slot-scope="scope">
+                <el-tag :type="scope.row.status | statusFilterType">{{
+                    scope.row.status | statusFilterName
+                  }}
+                </el-tag>
+              </template>
+            </el-table-column>
+
+
+            <!--      <el-table-column label="状态" align="center" width="100">-->
+            <!--        <template slot-scope="scope">-->
+            <!--          <el-switch-->
+            <!--            v-model="scope.row.status"-->
+            <!--            active-value="0"-->
+            <!--            inactive-value="1"-->
+            <!--            @change="handleStatusChange(scope.row)"-->
+            <!--          ></el-switch>-->
+            <!--        </template>-->
+            <!--      </el-table-column>-->
+            <el-table-column label="创建时间" align="center" prop="createTime">
+              <template slot-scope="scope">
+                <span>{{ parseTime(scope.row.createTime) }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="操作" align="center">
+              <template slot-scope="scope">
+                <el-button
+                  :disabled="scope.row.roleId === 1"
+                  type="text"
+                  @click="handleUpdate(scope.row)"
+                >编辑
+                </el-button>
+                <el-button
+                  type="text"
+                  :disabled="scope.row.roleId === 1"
+                  @click="handleDelete(scope.row)"
+                >删除
+                </el-button>
+                <!--          <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)"-->
+                <!--          >-->
+                <!--          <span class="el-dropdown-link">-->
+                <!--              <i class="el-icon-d-arrow-right el-icon&#45;&#45;right"></i>更多-->
+                <!--            </span>-->
+                <!--            <el-dropdown-menu slot="dropdown">-->
+                <!--              <el-dropdown-item command="handleDataScope" icon="el-icon-circle-check"-->
+                <!--              >数据权限-->
+                <!--              </el-dropdown-item>-->
+                <!--              <el-dropdown-item command="handleAuthUser" icon="el-icon-user"-->
+                <!--              >分配用户-->
+                <!--              </el-dropdown-item>-->
+                <!--            </el-dropdown-menu>-->
+                <!--          </el-dropdown>-->
+              </template>
+            </el-table-column>
+          </el-table>
+
+          <pagination
+            v-show="total>0"
+            :total="total"
+            :page.sync="queryParams.page"
+            :limit.sync="queryParams.limit"
+            @pagination="getCustomerList"
+          />
+        </el-tab-pane>
+
+
+
+        </el-tabs>
 
       <!-- 添加或修改角色配置对话框 -->
       <el-dialog :title="title" :visible.sync="open" width="40%" append-to-body>
@@ -230,6 +343,7 @@ export default {
     return {
       // 遮罩层
       loading: true,
+      Adminloading:true,
       // 选中数组
       ids: [],
       // 非单个禁用
@@ -240,6 +354,9 @@ export default {
       showSearch: true,
       // 总条数
       total: 0,
+      Admintotal:0,
+      //内部角色
+      AdminroleList:[],
       // 角色表格数据
       roleList: [],
       // 弹出层标题
@@ -289,6 +406,8 @@ export default {
         roleKey: undefined,
         status: undefined
       },
+      AdminParams:{},
+      Params:{},
       // 表单参数
       form: {},
       defaultProps: {
@@ -330,13 +449,27 @@ export default {
 
   created() {
     this.getList();
+    this.getCustomerList();
   },
   methods: {
     /** 查询角色列表 */
     getList() {
+      this.Adminloading =true;
+       this.AdminParams=this.queryParams
+      this.AdminParams.isCustomer=0;
+      listRole(this.addDateRange(this.AdminParams, this.dateRange)).then(response => {
+              this.AdminroleList=response.data.list
+              this.Admintotal = response.data.total;
+              this.Adminloading =false;
+        }
+      );
+    },
+    getCustomerList() {
       this.loading = true;
+      this.Params=this.queryParams
+      this.Params.isCustomer=1;
       listRole(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
-          this.roleList = response.data.list;
+              this.roleList=response.data.list
           this.total = response.data.total;
           this.loading = false;
         }
@@ -430,6 +563,7 @@ export default {
     handleQuery() {
       this.queryParams.page = 1;
       this.getList();
+      this.getCustomerList();
     },
     /** 重置按钮操作 */
     resetQuery() {
diff --git a/src/views/system/user/authUser.vue b/src/views/system/user/authUser.vue
index a544c8b..f6c4731 100644
--- a/src/views/system/user/authUser.vue
+++ b/src/views/system/user/authUser.vue
@@ -150,6 +150,7 @@
                   placeholder="请选择"
                   :remote-method="findDeptMethod"
                   :loading="loading"
+                  @change="findInv"
                 >
                   <el-option
                     v-for="item in fromDeptOptions"
@@ -165,19 +166,37 @@
 
               </el-form-item>
             </el-col>
-
             <el-col :span="11" type="flex">
-              <el-form-item label="状态" prop="userFlag">
-                <el-radio-group v-model="formData.userFlag" :disabled="formData.id === 1">
-                  <el-radio :label="1">正常</el-radio>
-                  <el-radio :label="0">禁用</el-radio>
+              <el-form-item label="所属仓库" prop="depts">
+                <el-select
+                  v-model="formData.warehouseName"
+                  filterable
+                  remote
+                  clearable="true"
+                  style="width: 90%"
+                  size="small"
+                  reserve-keyword
+                  placeholder="请选择"
+                  :loading="loading"
+                >
+                  <el-option
+                    v-for="item in fromWarehouseOptions"
+                    :key="item.code"
+                    :label="item.name"
+                    :value="item.code">
+                    <span style="float: left">{{ item.code }}</span>
+                    <span style="float: right; color: #8492a6; font-size: 13px">{{
+                        item.name
+                      }}</span>
+                  </el-option>
+                </el-select>
 
-                </el-radio-group>
               </el-form-item>
             </el-col>
+
           </el-row>
           <el-row :gutter="20" type="flex">
-            <el-col :span="23" type="flex">
+            <el-col :span="11" type="flex">
               <el-form-item label="角色">
                 <el-checkbox-group v-model="formData.roles" :disabled="formData.id === 1">
                   <el-checkbox
@@ -190,6 +209,16 @@
                 </el-checkbox-group>
               </el-form-item>
             </el-col>
+
+            <el-col :span="11" type="flex">
+              <el-form-item label="状态" prop="userFlag">
+                <el-radio-group v-model="formData.userFlag" :disabled="formData.id === 1">
+                  <el-radio :label="1">正常</el-radio>
+                  <el-radio :label="0">禁用</el-radio>
+
+                </el-radio-group>
+              </el-form-item>
+            </el-col>
           </el-row>
           <el-row type="flex">
             <el-col :span="23" type="flex">
@@ -230,7 +259,7 @@ import {findConfig} from "@/api/sync/spsSyncStatus";
 import {isBlank} from "@/utils/strUtil";
 import {listRole} from "@/api/system/role";
 import {selectSysParamByKey} from "@/api/system/systemParamConfig";
-import {filterList} from "@/api/system/invWarehouse";
+import { filterList, selectInvById } from '@/api/system/invWarehouse'
 
 const formJson = {
   id: "",
@@ -287,6 +316,7 @@ export default {
       formData: formJson,
       selectDeptList: [],
       fromDeptOptions: [],
+      fromWarehouseOptions:[],
       configParms: {},
       formRules: {},
       addRules: {
@@ -349,6 +379,16 @@ export default {
       this.query.page = 1;
       this.getList();
     },
+    findInv(val){
+    // 获取仓库列表
+      selectInvById(val)
+        .then((res) => {
+            if(res.code == 20000){
+                  this.fromWarehouseOptions = res.data || [];
+            }
+        })
+
+    },
     handleCurrentChange(val) {
       this.query.page = val;
       this.getList();
@@ -416,6 +456,7 @@ export default {
           roles: row.roles,
           depts: row.depts,
           dept: row.dept,
+          warehouseName:row.warehouseName
         };
       }
       this.formName = "add";
@@ -440,10 +481,12 @@ export default {
         this.$message.error("未指定角色！")
         return;
       }
+      debugger
       this.$refs["dataForm"].validate(valid => {
         if (valid) {
           this.formLoading = true;
           let data = Object.assign({}, this.formData);
+          debugger
           authAdminSave(data, this.formName).then(response => {
             this.formLoading = false;
             if (response.code !== 20000) {

From 622906b0da2b6a702a9af48e4cb688999f979e73 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Thu, 6 Apr 2023 15:28:19 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=A1=E6=A0=B8?=
 =?UTF-8?q?=E9=80=81=E8=B4=A7=E5=8D=95=20=E6=9F=A5=E8=AF=A2=E5=87=BA?=
 =?UTF-8?q?=E5=85=A5=E5=BA=93=E7=9A=84=E5=AE=A1=E6=A0=B8=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/inout/IoDeliveryAuditOrder.vue  | 2 +-
 src/views/inout/IoDeliverySearchOrder.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/inout/IoDeliveryAuditOrder.vue b/src/views/inout/IoDeliveryAuditOrder.vue
index d0dd657..fa46684 100644
--- a/src/views/inout/IoDeliveryAuditOrder.vue
+++ b/src/views/inout/IoDeliveryAuditOrder.vue
@@ -158,7 +158,7 @@
         </el-table-column>
         <el-table-column label="收货仓库" prop="invName" width="120">
         </el-table-column>
-        <el-table-column label="验收人" prop="reviewUserName" width="120">
+        <el-table-column label="审核人" prop="reviewUserName" width="120">
         </el-table-column>
         <el-table-column label="来源单号" prop="corpOrderId" show-overflow-tooltip width="180"></el-table-column>
         <el-table-column label="来源" prop="fromType" width="120">
diff --git a/src/views/inout/IoDeliverySearchOrder.vue b/src/views/inout/IoDeliverySearchOrder.vue
index 966ba5f..adf7adb 100644
--- a/src/views/inout/IoDeliverySearchOrder.vue
+++ b/src/views/inout/IoDeliverySearchOrder.vue
@@ -168,7 +168,7 @@
 
         <el-table-column label="采购部门" prop="deptName" width="120">
         </el-table-column>
-        <el-table-column label="验收人" prop="reviewUserName" width="120">
+        <el-table-column label="审核人" prop="reviewUserName" width="120">
         </el-table-column>
         <el-table-column label="收货仓库" prop="invName" width="120">
         </el-table-column>

From a6a4238fcc31f3f75ab200df44a0880438e8e804 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Thu, 6 Apr 2023 16:38:31 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=A8=E6=88=B7?=
 =?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/views/system/user/authUser.vue | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/views/system/user/authUser.vue b/src/views/system/user/authUser.vue
index f6c4731..dbd64a4 100644
--- a/src/views/system/user/authUser.vue
+++ b/src/views/system/user/authUser.vue
@@ -481,12 +481,11 @@ export default {
         this.$message.error("未指定角色！")
         return;
       }
-      debugger
       this.$refs["dataForm"].validate(valid => {
         if (valid) {
           this.formLoading = true;
+          this.formData.locInvCode  = this.formData.warehouseName
           let data = Object.assign({}, this.formData);
-          debugger
           authAdminSave(data, this.formName).then(response => {
             this.formLoading = false;
             if (response.code !== 20000) {