From fb145432c6fe59ce98f5fb802f382120b01d9679 Mon Sep 17 00:00:00 2001
From: ruanqi <qi.ruan@xujiesoft.com>
Date: Fri, 23 Feb 2024 10:05:05 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E6=8E=89pdf=E6=8F=92=E4=BB=B6=20=20?=
 =?UTF-8?q?=E6=97=A0=E7=94=A8=20=20=E5=AF=BC=E8=87=B4=E6=89=93=E5=8C=85?=
 =?UTF-8?q?=E5=A4=B1=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/sys/user-add-or-update.vue | 42 +++++++++++++++-----
 1 file changed, 33 insertions(+), 9 deletions(-)

diff --git a/src/views/modules/sys/user-add-or-update.vue b/src/views/modules/sys/user-add-or-update.vue
index bfeaf6b..1e86f8c 100644
--- a/src/views/modules/sys/user-add-or-update.vue
+++ b/src/views/modules/sys/user-add-or-update.vue
@@ -34,16 +34,18 @@
           </el-form-item>
         </el-form>
         <el-form>
-          <el-form-item>
-            <span slot="label" style="" @click="getBaseList(93)"><a herf="#">工厂</a></span>
-            <el-input v-model="dataForm.site" style="width: 150px;" placeholder="工厂"></el-input>
-          </el-form-item>
-          <el-form-item label="语言" prop="languageDefault">
-            <el-select filterable v-model="dataForm.languageDefault"  style="width: 150px;">
-              <el-option :label="item.languageName" :value="item.languageCode" v-for="(item,index) in languageList "
+          <el-form-item label="工厂">
+            <el-select filterable v-model="dataForm.site"  style="width: 150px;">
+              <el-option :label="item.siteID+'-'+item.siteName" :value="item.siteID" v-for="(item,index) in siteList "
                          :key="index"></el-option>
             </el-select>
           </el-form-item>
+<!--          <el-form-item label="语言" prop="languageDefault">-->
+<!--            <el-select filterable v-model="dataForm.languageDefault"  style="width: 150px;">-->
+<!--              <el-option :label="item.languageName" :value="item.languageCode" v-for="(item,index) in languageList "-->
+<!--                         :key="index"></el-option>-->
+<!--            </el-select>-->
+<!--          </el-form-item>-->
         </el-form>
         <el-form>
           <el-form-item label="角色" size="mini" prop="roleIdList">
@@ -77,7 +79,7 @@
 <script>
   import Chooselist from '@/views/modules/common/Chooselist'
   import {searchSysLanguage} from "@/api/sysLanguage.js"
-
+  import {getSiteData} from "@/api/base/site.js"
   export default {
     data() {
       return {
@@ -100,6 +102,7 @@
           site: '',
           userDisplay: ''
         },
+        siteList:[],
         dataRule: {
           userName: [
             {required: true, message: ' ', trigger: 'blur'}
@@ -123,6 +126,14 @@
       Chooselist
     },
     methods: {
+      getSite(){
+        let data={
+          companyName:'',
+        }
+        getSiteData(data).then(({data})=>{
+          this.siteList=data.rows
+        })
+      },
       getBaseData(val){
         if (this.tagNo === 93){
           this.dataForm.site = val.SiteID
@@ -150,6 +161,7 @@
         this.dataForm.id = id || 0
         // this.factoryList();
         this.getLanguageList();
+        this.getSite()
         this.$http({
           url: this.$http.adornUrl('/sys/role/select'),
           method: 'get',
@@ -180,7 +192,18 @@
                 this.dataForm.userDisplay = data.user.userDisplay
               }
             })
+          }else {
+            this.dataForm.userName = ''
+            this.dataForm.salt = ''
+            this.dataForm.email =''
+            this.dataForm.mobile = ''
+            this.dataForm.roleIdList = []
+            this.dataForm.status = 1
+            this.dataForm.languageDefault = 'cn'
+            this.dataForm.site = this.siteList[0].siteID
+            this.dataForm.userDisplay =''
           }
+
         })
       },
       // 表单提交
@@ -218,7 +241,8 @@
       // 关闭模态框
       closeDialog(){
         Object.assign(this.$data, this.$options.data())
-      }
+      },
+
     },
     created() {
       // this.factoryList()