Merge remote-tracking branch 'origin/master'

src/views/modules/common/Chooselist.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :title="title" center
+  <el-dialog :title="baseListData.description" center
              :close-on-click-modal="false" :show-close="false" :close-on-press-escape="false"
              :visible.sync="visible"
              width="685px" v-drag>
@@ -7,13 +7,14 @@
              inline="inline"
              size="mini"
              label-width="120px">
-      <el-form-item :label="baseListData.caption1" v-if="baseListData.caption1!='' && baseListData.caption1!=null">
+      <el-form-item v-if="" :label="baseListData.caption1" v-if="baseListData.caption1!='' && baseListData.caption1!=null">
         <el-input v-model="param1"></el-input>
       </el-form-item>
       <el-form-item :label="baseListData.caption2" v-if="baseListData.caption2!='' && baseListData.caption2!=null">
         <el-input v-model="param2"></el-input>
       </el-form-item>
       <el-form-item :label="baseListData.caption4" v-if="baseListData.caption4!='' && baseListData.caption4!=null">
+
         <el-input v-model="param4"></el-input>
       </el-form-item>
       <el-form-item :label="baseListData.caption3" v-if="baseListData.caption3!='' && baseListData.caption3!=null">
@@ -162,7 +163,7 @@ export default {
       if (this.param3) {
         sql += " and active like '%" + this.param3 + "%'"
       }
-      if (this.param4) {
+      if (this.baseListData.caption4) {
         sql += " and site=" + this.param4
       }
       getChooselistData({"sqlcode": sql}).then(({data}) => {

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

@@ -504,7 +504,7 @@ export default {
     // 获取基础数据列表
     getBaseList(){
       this.$nextTick(() => {
-        this.$refs.baseList.init(3,'fdsa')
+        this.$refs.baseList.init(1003,'fdsa')
       })
     },
     // 打印方式