From c1ed92ef890aaf32b53adc3314550dd8bd44f9ed Mon Sep 17 00:00:00 2001
From: guoxing <1369478551@qq.com>
Date: Wed, 7 Aug 2024 10:25:51 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=9F=BA=E7=A1=80=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplier/relation/openingbank.vue         | 235 ++++++++++--------
 .../supplier/supplier/supplierAdd.vue         |  33 +--
 .../goodsShelves/goodsShelvesAdd.vue          |   2 +-
 .../warehouses/warehouse/warehouseAdd.vue     |  14 +-
 .../warehouseArea/warehouseAreaAdd.vue        |   2 +-
 src/views/system/userManage/userManageAdd.vue |   7 +-
 .../system/userManage/userManageList.vue      |   6 +-
 7 files changed, 164 insertions(+), 135 deletions(-)

diff --git a/src/views/baseInfo/supplier/supplier/relation/openingbank.vue b/src/views/baseInfo/supplier/supplier/relation/openingbank.vue
index d439332..baabd41 100644
--- a/src/views/baseInfo/supplier/supplier/relation/openingbank.vue
+++ b/src/views/baseInfo/supplier/supplier/relation/openingbank.vue
@@ -13,23 +13,27 @@
           <el-row style="border-top: 1px solid #e0e3eb">
             <el-col :span="12">
               <div class="span-sty"><span class="icon">*</span>开户银行</div>
-              <el-form-item prop="bankName"><el-input class="addinputInfo addinputw" v-model="formobj.bankName" clearable placeholder="" /></el-form-item>
+              <el-form-item prop="bankName"><el-input class="addinputInfo addinputw" v-model="formobj.bankName"
+                  clearable placeholder="" /></el-form-item>
             </el-col>
             <el-col :span="12">
               <div class="span-sty"><span class="icon">*</span>银行账号</div>
-              <el-form-item prop="bankAccount"><el-input class="addinputInfo addinputw" v-model="formobj.bankAccount" clearable placeholder="" /></el-form-item>
+              <el-form-item prop="bankAccount"><el-input class="addinputInfo addinputw" v-model="formobj.bankAccount"
+                  clearable placeholder="" /></el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="12">
               <div class="span-sty"><span class="icon">*</span>账号名称</div>
-              <el-form-item prop="accountName"><el-input class="addinputInfo addinputw" v-model="formobj.accountName" clearable placeholder="" /></el-form-item>
+              <el-form-item prop="accountName"><el-input class="addinputInfo addinputw" v-model="formobj.accountName"
+                  clearable placeholder="" /></el-form-item>
             </el-col>
             <el-col :span="12">
               <div class="span-sty"><span class="icon">*</span>账号类型</div>
               <el-form-item prop="dueBankKey">
                 <el-select v-model="formobj.dueBankKey" class="addinputInfo" placeholder="" @change="dueBankChange">
-                  <el-option v-for="item in dueBank_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
+                  <el-option v-for="item in dueBank_list" :key="item.dictKey" :label="item.dictValue"
+                    :value="item.dictKey" />
                 </el-select>
               </el-form-item>
             </el-col>
@@ -37,27 +41,32 @@
           <el-row>
             <el-col :span="24">
               <div class="span-sty">开户行地址</div>
-              <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.bankAddress" clearable placeholder="" /></el-form-item>
+              <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.bankAddress" clearable
+                  placeholder="" /></el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="12">
               <div class="span-sty">银行网点</div>
-              <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.bankingOutlets" clearable placeholder="" /></el-form-item>
+              <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.bankingOutlets" 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.paymentLines" clearable placeholder="" /></el-form-item>
+              <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.paymentLines" clearable
+                  placeholder="" /></el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="12">
               <div class="span-sty">swiftCode(银行代码)</div>
-              <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.swiftCode" clearable placeholder="" /></el-form-item>
+              <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.swiftCode" 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.currency" clearable placeholder="" /></el-form-item>
+              <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.currency" clearable
+                  placeholder="" /></el-form-item>
             </el-col>
           </el-row>
         </el-form>
@@ -67,108 +76,130 @@
 </template>
 
 <script>
-import { typeValues } from '@/api/Common/dictcommons'
+  import {
+    typeValues
+  } from '@/api/Common/dictcommons'
 
-export default {
-  name: 'OpeningBank',
-  data() {
-    return {
-      viewTitle: '',
-      viewState: 1,
-      dueBank_list: [],
-      formobj: {
-        sid: '',
-        supplierSid: '',
-        bankName: '',
-        bankAccount: '',
-        accountName: '',
-        dueBankKey: '',
-        dueBankValue: '',
-        bankingOutlets: '',
-        bankAddress: '',
-        paymentLines: '',
-        swiftCode: '',
-        currency: ''
-      },
-      index: '',
-      rules: {
-        bankName: [{ required: true, message: '开户银行不能为空', trigger: 'blur' }],
-        bankAccount: [{ required: true, message: '银行账号不能为空', trigger: 'blur' }],
-        accountName: [{ required: true, message: '账号名称不能为空', trigger: 'blur' }],
-        dueBankKey: [{ required: true, message: '账号类型不能为空', trigger: 'change' }]
-      }
-    }
-  },
-  methods: {
-    init() {
-      typeValues({ type: 'dueBank' }).then((res) => {
-        if (res.success) {
-          this.dueBank_list = res.data
+  export default {
+    name: 'OpeningBank',
+    data() {
+      return {
+        viewTitle: '',
+        viewState: 1,
+        dueBank_list: [],
+        formobj: {
+          sid: '',
+          supplierSid: '',
+          bankName: '',
+          bankAccount: '',
+          accountName: '',
+          dueBankKey: '',
+          dueBankValue: '',
+          bankingOutlets: '',
+          bankAddress: '',
+          paymentLines: '',
+          swiftCode: '',
+          currency: ''
+        },
+        index: '',
+        rules: {
+          bankName: [{
+            required: true,
+            message: '开户银行不能为空',
+            trigger: 'blur'
+          }],
+          bankAccount: [{
+            required: true,
+            message: '银行账号不能为空',
+            trigger: 'blur'
+          }],
+          accountName: [{
+            required: true,
+            message: '账号名称不能为空',
+            trigger: 'blur'
+          }],
+          dueBankKey: [{
+            required: true,
+            message: '账号类型不能为空',
+            trigger: 'change'
+          }]
         }
-      })
-    },
-    showAdd() {
-      this.viewTitle = '【新增】开户行信息'
-      this.$nextTick(() => {
-        this.$refs['form_obj'].clearValidate()
-      })
-      this.init()
-    },
-    showEdit(value, index) {
-      this.viewTitle = '【编辑】开户行信息'
-      this.$nextTick(() => {
-        this.$refs['form_obj'].clearValidate()
-      })
-      this.init()
-      this.formobj = JSON.parse(JSON.stringify(value))
-      this.index = index
-    },
-    dueBankChange(value) {
-      const choose = this.dueBank_list.filter((item) => item.dictKey === value)
-      if (choose !== null && choose.length > 0) {
-        this.formobj.dueBankValue = choose[0].dictValue
-      } else {
-        this.formobj.dueBankValue = ''
       }
     },
-    saveOrUpdate() {
-      this.$refs['form_obj'].validate((valid) => {
-        if (valid) {
-          this.$emit('backData', this.formobj, this.index)
-          this.handleReturn()
+    methods: {
+      init() {
+        typeValues({
+          type: 'accountType'
+        }).then((res) => {
+          if (res.success) {
+            this.dueBank_list = res.data
+          }
+        })
+      },
+      showAdd() {
+        this.viewTitle = '【新增】开户行信息'
+        this.$nextTick(() => {
+          this.$refs['form_obj'].clearValidate()
+        })
+        this.init()
+      },
+      showEdit(value, index) {
+        this.viewTitle = '【编辑】开户行信息'
+        this.$nextTick(() => {
+          this.$refs['form_obj'].clearValidate()
+        })
+        this.init()
+        this.formobj = JSON.parse(JSON.stringify(value))
+        this.index = index
+      },
+      dueBankChange(value) {
+        const choose = this.dueBank_list.filter((item) => item.dictKey === value)
+        if (choose !== null && choose.length > 0) {
+          this.formobj.dueBankValue = choose[0].dictValue
+        } else {
+          this.formobj.dueBankValue = ''
         }
-      })
-    },
-    handleReturn() {
-      this.formobj = {
-        sid: '',
-        supplierSid: '',
-        bankName: '',
-        bankAccount: '',
-        accountName: '',
-        dueBankKey: '',
-        dueBankValue: '',
-        bankingOutlets: '',
-        bankAddress: '',
-        paymentLines: '',
-        swiftCode: '',
-        currency: ''
+      },
+      saveOrUpdate() {
+        this.$refs['form_obj'].validate((valid) => {
+          if (valid) {
+            this.$emit('backData', this.formobj, this.index)
+            this.handleReturn()
+          }
+        })
+      },
+      handleReturn() {
+        this.formobj = {
+          sid: '',
+          supplierSid: '',
+          bankName: '',
+          bankAccount: '',
+          accountName: '',
+          dueBankKey: '',
+          dueBankValue: '',
+          bankingOutlets: '',
+          bankAddress: '',
+          paymentLines: '',
+          swiftCode: '',
+          currency: ''
+        }
+        this.index = ''
+        this.$emit('doback')
       }
-      this.index = ''
-      this.$emit('doback')
     }
   }
-}
 </script>
 
 <style scoped>
-.span-sty {
-  width: 140px !important;
-}
-.addinputInfo {
-  margin-left: 130px !important;
-}
-/deep/ .el-form-item__error {
-  margin-left: 120px !important;
-}
+  .span-sty {
+    width: 140px !important;
+  }
+
+  .addinputInfo {
+    margin-left: 130px !important;
+  }
+
+  /deep/ .el-form-item__error {
+    margin-left: 120px !important;
+  }
 </style>
diff --git a/src/views/baseInfo/supplier/supplier/supplierAdd.vue b/src/views/baseInfo/supplier/supplier/supplierAdd.vue
index 750120f..cd82066 100644
--- a/src/views/baseInfo/supplier/supplier/supplierAdd.vue
+++ b/src/views/baseInfo/supplier/supplier/supplierAdd.vue
@@ -407,22 +407,24 @@
       },
       backData(value, index) {
         this.viewState = 1
-        value = JSON.parse(JSON.stringify(value))
+
         if (index !== '' && index !== null) {
-          this.formobj.baseSupplierBankList[index] = {
-            sid: value.sid,
-            supplierSid: value.supplierSid,
-            bankName: value.bankName,
-            bankAccount: value.bankAccount,
-            accountName: value.accountName,
-            dueBankKey: value.dueBankKey,
-            dueBankValue: value.dueBankValue,
-            bankingOutlets: value.bankingOutlets,
-            bankAddress: value.bankAddress,
-            paymentLines: value.paymentLines,
-            swiftCode: value.swiftCode,
-            currency: value.currency
-          }
+          // this.formobj.baseSupplierBankList[index] = {
+          //   sid: value.sid,
+          //   supplierSid: value.supplierSid,
+          //   bankName: value.bankName,
+          //   bankAccount: value.bankAccount,
+          //   accountName: value.accountName,
+          //   dueBankKey: value.dueBankKey,
+          //   dueBankValue: value.dueBankValue,
+          //   bankingOutlets: value.bankingOutlets,
+          //   bankAddress: value.bankAddress,
+          //   paymentLines: value.paymentLines,
+          //   swiftCode: value.swiftCode,
+          //   currency: value.currency
+          // }
+
+          this.$set(this.formobj.baseSupplierBankList, index, value)
         } else {
           this.formobj.baseSupplierBankList.push({
             sid: '',
@@ -439,6 +441,7 @@
             currency: value.currency
           })
         }
+
       },
       resetState() {
         this.viewState = 1
diff --git a/src/views/baseInfo/warehouses/goodsShelves/goodsShelvesAdd.vue b/src/views/baseInfo/warehouses/goodsShelves/goodsShelvesAdd.vue
index 577a746..b0548e3 100644
--- a/src/views/baseInfo/warehouses/goodsShelves/goodsShelvesAdd.vue
+++ b/src/views/baseInfo/warehouses/goodsShelves/goodsShelvesAdd.vue
@@ -108,7 +108,7 @@
           this.$message({
             showClose: true,
             type: 'warning',
-            message: '所属仓区不能为空'
+            message: '所属库区不能为空'
           })
           return
         }
diff --git a/src/views/baseInfo/warehouses/warehouse/warehouseAdd.vue b/src/views/baseInfo/warehouses/warehouse/warehouseAdd.vue
index 799e779..22df2be 100644
--- a/src/views/baseInfo/warehouses/warehouse/warehouseAdd.vue
+++ b/src/views/baseInfo/warehouses/warehouse/warehouseAdd.vue
@@ -62,8 +62,8 @@
         <div class="item">
           <span class="item_text"><span class="must">*</span> 使用状态：</span>
           <el-radio-group v-model="formobj.usageStatus" size="small" @change="changeTheme" class="item_input">
-            <el-radio :label="'1'">正常</el-radio>
-            <el-radio :label="'0'">停用</el-radio>
+            <el-radio :label="1">正常</el-radio>
+            <el-radio :label="0">停用</el-radio>
           </el-radio-group>
           <!-- <el-input v-model="formobj.usageStatus" placeholder="仓库排序" class="item_input" clearable /> -->
         </div>
@@ -100,7 +100,7 @@
           manager: '',
           longitude: '',
           latitude: '',
-          usageStatus: "1",
+          usageStatus: 1,
           address: '',
           squareMeter: '',
           sortNo: '',
@@ -148,14 +148,6 @@
           return
         }
 
-        if (this.formobj.usageStatus == '') {
-          this.$message({
-            showClose: true,
-            type: 'warning',
-            message: '使用状态不能为空'
-          })
-          return
-        }
 
         if (this.formobj.sortNo == '') {
           this.$message({
diff --git a/src/views/baseInfo/warehouses/warehouseArea/warehouseAreaAdd.vue b/src/views/baseInfo/warehouses/warehouseArea/warehouseAreaAdd.vue
index cfd2e85..8126d74 100644
--- a/src/views/baseInfo/warehouses/warehouseArea/warehouseAreaAdd.vue
+++ b/src/views/baseInfo/warehouses/warehouseArea/warehouseAreaAdd.vue
@@ -124,7 +124,7 @@
           this.$message({
             showClose: true,
             type: 'warning',
-            message: '仓区名称不能为空'
+            message: '库区名称不能为空'
           })
           return
         }
diff --git a/src/views/system/userManage/userManageAdd.vue b/src/views/system/userManage/userManageAdd.vue
index 4026ed5..da4d8fa 100644
--- a/src/views/system/userManage/userManageAdd.vue
+++ b/src/views/system/userManage/userManageAdd.vue
@@ -18,7 +18,8 @@
       <div style="display: flex;flex-direction: row;width: 100%;margin-top: 10px;">
         <div style="display: flex;flex-direction: row;flex: 1 ; align-items: center;">
           <span style="width: 80px;text-align: right;"><span class="must">*</span> 部门：</span>
-          <el-select v-model="form.sysStaffOrg.orgName" placeholder="请选择" style="margin-left: 10px; flex: 0.8;">
+          <el-select ref="treeSelect" v-model="form.sysStaffOrg.orgName" placeholder="请选择"
+            style="margin-left: 10px; flex: 0.8;">
             <el-option hidden :key="form.sysStaffOrg.orgSid" :label="form.sysStaffOrg.orgName"
               :value="form.sysStaffOrg.orgName"></el-option>
             <el-tree :data="treedata" ref="Tree" accordion node-key="sid" :default-checked-keys="checkedId"
@@ -130,6 +131,8 @@
 
         this.form.accountType = val ? "2" : "3"
 
+
+
       },
       manageTypeChange(val) {
         console.log("manageTypeChange", val);
@@ -190,7 +193,7 @@
         this.form.sysStaffOrg.orgSid = val.sid
         this.form.sysStaffOrg.orgName = val.name
         this.form.sysStaffOrg.orgCode = val.orgCode
-        this.$refs.Tree.visible = false
+        this.$refs.treeSelect.visible = false
 
       },
       checkchange(data, checked, indeterminate) {
diff --git a/src/views/system/userManage/userManageList.vue b/src/views/system/userManage/userManageList.vue
index 6925216..026955f 100644
--- a/src/views/system/userManage/userManageList.vue
+++ b/src/views/system/userManage/userManageList.vue
@@ -129,7 +129,8 @@
         <div style="display: flex;flex-direction: row;width: 100%;margin-top: 10px;">
           <div style="display: flex;flex-direction: row;flex: 1 ; align-items: center;">
             <span style="width: 80px;text-align: right;"><span class="must">*</span> 部门：</span>
-            <el-select v-model="form.sysStaffOrg.orgName" placeholder="请选择" style="margin-left: 10px; flex: 0.8;">
+            <el-select ref="treeSelect" v-model="form.sysStaffOrg.orgName" placeholder="请选择"
+              style="margin-left: 10px; flex: 0.8;">
               <el-option hidden :key="form.sysStaffOrg.orgSid" :label="form.sysStaffOrg.orgName"
                 :value="form.sysStaffOrg.orgName"></el-option>
               <el-tree :data="treedata" ref="Tree" @node-click="nodeClick" accordion node-key="sid"
@@ -146,7 +147,6 @@
               @change="roleChange">
               <el-option v-for="(item,i) in roleListAll" :key="i" :label="item.name" :value="item.sid"></el-option>
             </el-select>
-
           </div>
         </div>
 
@@ -349,7 +349,7 @@
         this.form.sysStaffOrg.orgSid = val.sid
         this.form.sysStaffOrg.orgName = val.name
         this.form.sysStaffOrg.orgCode = val.orgCode
-        this.$refs.Tree.visible = false
+        this.$refs.treeSelect.visible = false
 
       },
       checkchange(data, checked, indeterminate) {