Merge remote-tracking branch 'origin/master'

src/views/modules/common/list.vue → src/views/modules/common/Chooselist.vue

@@ -23,7 +23,7 @@
           <el-option label="不在用" value="N"></el-option>
         </el-select>
       </el-form-item>
-      <el-button style="margin-top: 18px" type="primary" @click="getDataList()">查询
+      <el-button style="margin-top: 18px" type="primary" @click="getDataList(false)">查询
       </el-button>
     </el-form>
 
@@ -78,7 +78,8 @@ export default {
       param1: '',
       param2: '',
       param3: '',
-      param4: '',
+      param: '',
+      param4: this.$store.state.user.site,
       dataList: [],
       baseListData: {
         caption1: '',
@@ -90,14 +91,16 @@ export default {
         fieldname2: '',
         sqlcode: '',
         tagno: '',
-      }
+      },
+      defaultParam: false
     }
   },
   methods: {
 
     // 获取 用户的配置
-    init(tagNo) {
+    init(tagNo,param) {
       this.visible = true;
+      this.param = param
       // 根据 tagNo 获取列表
       getChooselist({"tagNo": tagNo}).then(({data}) => {
         this.columnList = []
@@ -140,11 +143,16 @@ export default {
           }
           this.columnList.push(column)
         })
+        this.getDataList(true)
       })
       this.dataListLoading = false
+
     },
-    getDataList() {
+    getDataList(bool) {
       let sql = this.baseListData.sqlcode
+      if (bool){
+        sql += " and  (" + this.baseListData.fieldname1 + " like '%" + this.param + "%' OR "+this.baseListData.fieldname2 + " like '%" + this.param + "%'" +" ) "
+      }
       if (this.param1) {
         sql += " and " + this.baseListData.fieldname1 + " like '%" + this.param1 + "%'"
       }

src/views/modules/sys/language/common.vue

@@ -82,7 +82,7 @@
     <!-- 动态列    -->
     <column v-if="visible" ref="column" @refreshData="getTableUserColumn"></column>
 
-    <list  ref="baseList"  @getBaseData="getBaseData"></list>
+    <Chooselist ref="baseList"  @getBaseData="getBaseData"></Chooselist>
 
     <el-dialog :close-on-click-modal="false" :close-on-press-escape="false" v-drag
                :title="'设置语言一'+querySysLanguagePack.languageCode" :visible.sync="addLanguage" width="1000px">
@@ -134,7 +134,7 @@
 <script>
 
 import column from "../../common/column";
-import list from '../../common/list'
+import list from '@/views/modules/common/Chooselist'
 import {
   searchSysLanguagePackList,
   searchSysLanguageParam,
@@ -160,11 +160,11 @@ import {userFavoriteList, saveUserFavorite, removeUserFavorite} from '@/api/user
 export default {
   components: {
     column,
-    list
+    Chooselist
   },
   data() {
     return {
-      listShow:false,
+      listShow: false,
       // table高度
       height: 450,
       // 是否收藏
@@ -504,7 +504,7 @@ export default {
     // 获取基础数据列表
     getBaseList(){
       this.$nextTick(() => {
-        this.$refs.baseList.init(3)
+        this.$refs.baseList.init(3,'fdsa')
       })
     },
     // 打印方式

src/views/modules/warehouse/location.vue

@@ -120,7 +120,7 @@
       <el-dialog :close-on-click-modal="false" :close-on-press-escape="false" v-drag :title="inputLabel.headerInput.label5" :visible.sync="setUp.reviewFlag" width="325px">
         <el-form :inline="true" label-position="top">
           <el-form-item :label="inputLabel.headerInput.label1">
-            <el-input style="width: 130px;" :readonly = "setUp.readonlyFlag" onkeyup="this.value = this.value.toUpperCase()" v-model="saveHeaderData.locationId"></el-input>
+            <el-input style="width: 130px;" :readonly = "setUp.readonlyFlag?'readonly':false" onkeyup="this.value = this.value.toUpperCase()" v-model="saveHeaderData.locationId"></el-input>
           </el-form-item>
           <el-form-item :label="inputLabel.headerInput.label2">
             <el-input style="width: 130px;"  v-model="saveHeaderData.locationName"></el-input>
@@ -648,6 +648,7 @@ import {
         })
       },
       initModel(row){
+        console.log("1 =" +row)
         this.setUp.reviewFlag = true
         this.setUp.saveButton = false
         this.setUp.readonlyFlag = false
@@ -657,7 +658,8 @@ import {
         this.saveHeaderData.locationName = ''
         this.saveHeaderData.warehouseId = ''
         this.saveHeaderData.active = 'Y'
-        if(row != null){
+        if(row){
+          console.log("2 =" +row)
           this.setUp.readonlyFlag = true
           this.saveHeaderData.id = 1
           this.saveHeaderData.locationId = row.locationId