Browse Source

Merge branch 'test' of sckj/mz-cloud into master

NanMing 2 years ago
parent
commit
1fae4a3a9f

+ 5 - 3
ruoyi-web/src/components/Number/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div class="number">
     <el-input v-model="valueNumber" :disabled="disabled" :placeholder="'请输入'+placeholder" @input="handleChange(valueNumber)" clearable/>
   </div>
 </template>
@@ -103,6 +103,8 @@
   }
 </script>
 
-<style scoped>
-
+<style lang="scss" scoped>
+.number{
+  width: 100%;
+}
 </style>

+ 28 - 24
ruoyi-web/src/components/RegionCascaderSelect/index.vue

@@ -1,10 +1,11 @@
 <template>
-<!--  v-if 解决数据回显问题-->
-  <el-cascader v-if="show" :disabled="disabled" ref="cascader" v-model="cascaderValue" :props="props" v-bind="options" @change="handleChange"></el-cascader>
+  <!--  v-if 解决数据回显问题-->
+  <el-cascader v-if="show" :disabled="disabled" ref="cascader" v-model="cascaderValue" :props="props" v-bind="options"
+    @change="handleChange"></el-cascader>
 </template>
 <script>
 
-import {countryDeptList} from "@/api/home";
+import { countryDeptList } from "@/api/home";
 
 export default {
   name: 'regionCascaderSelect',
@@ -22,7 +23,7 @@ export default {
       type: String,
       default: 'code'
     },
-    disabled:{
+    disabled: {
       type: Boolean,
       default: false,
     },
@@ -40,6 +41,11 @@ export default {
       type: Object,
       default: null
     },
+    // 是否仅展示吉林省数据
+    isJl: {
+      type: Boolean,
+      default: true
+    },
     endLevel: {
       type: [Number, String],
       default: 4
@@ -50,12 +56,12 @@ export default {
     },
   },
   watch: {
-    checkStrictly(newVal){
+    checkStrictly(newVal) {
       this.props.checkStrictly = newVal;
     },
-    value:{
-      handler(newVal, oldVal){
-        if (this.isCascaderValueChange){
+    value: {
+      handler(newVal, oldVal) {
+        if (this.isCascaderValueChange) {
           this.isCascaderValueChange = false;
           return;
         }
@@ -66,7 +72,7 @@ export default {
       deep: true
     }
   },
-  mounted(){
+  mounted() {
     let defaultOpts = {
       placeholder: '请选择所属区划',
       'popper-class': 'cascader-popper region-cascader',
@@ -78,7 +84,7 @@ export default {
     };
     this.props.checkStrictly = this.checkStrictly;
   },
-  data(){
+  data() {
     return {
       options: {},
       show: true, //为了解决数据回显问题引入
@@ -87,23 +93,21 @@ export default {
     }
   },
   computed: {
-    props(){
+    props() {
       return {
         lazy: true,
         checkStrictly: true,
         lazyLoad: async (node, resolve) => {
           const { level } = node;
-          let levelData=0;
-          let params='';
-          if(level === 0)
-          {
-              params = { parentId: "479a446fce894740b373f9c4b356daac"}
-          }else
-          {
-            params={parentId: node.data.nodeData.id};
+          let levelData = 0;
+          let params = '';
+          if (level === 0) {
+            this.isJl ? params = '' : params = { parentId: "479a446fce894740b373f9c4b356daac" }
+          } else {
+            params = { parentId: node.data.nodeData.id };
           }
           // let params = level === 0 ? '' : {parentId: node.data.nodeData.id};
-          let response= await countryDeptList(params);
+          let response = await countryDeptList(params);
           let code = response.code;
           let data = response.data || response.rows;
           if (code !== 200) {
@@ -114,7 +118,7 @@ export default {
           let res = data.map(item => {
             let value = String(item[this.valueProp]);
             let disabled = level < this.startLevel;
-            let endLevel =  this.endLevel;
+            let endLevel = this.endLevel;
             return {
               disabled,
               label: item.name,
@@ -131,7 +135,7 @@ export default {
   created() {
   },
   methods: {
-    handleChange(value){
+    handleChange(value) {
       this.isCascaderValueChange = true;
       this.$emit('changeValue', value);
       //将被选中的节点的信息传递出去 👇
@@ -141,7 +145,7 @@ export default {
       //将被选中的节点的全部信息传递出去 👇
       this.$emit('nodeData', this.$refs.cascader.getCheckedNodes());
     },
-    setCascaderValue(newVal){
+    setCascaderValue(newVal) {
       this.show = false;
       let values = newVal || [];
       if (typeof values === 'string') {
@@ -153,7 +157,7 @@ export default {
         this.show = true;
       });
     },
-    getCheckedNodes(){
+    getCheckedNodes() {
       return this.$refs.cascader.getCheckedNodes();
     },
   }

+ 1 - 4
ruoyi-web/src/views/rzyljgsq/index.vue

@@ -132,10 +132,7 @@ const search = () => showSearch.value = true
 
 // 查询结果表单相关
 const formRef = ref()
-const form = reactive({
-  // xm: '夏洛',
-  // zjhm: '220123194808291226',
-})
+const form = reactive({})
 const rules = reactive({
   xm: [
     { required: true, message: '请输入老人姓名', trigger: 'blur' },

+ 5 - 12
ruoyi-web/src/views/rzyljgsq/sqzltx/index.vue

@@ -24,14 +24,14 @@
           <el-input v-model="form.yyLrRzyddh" placeholder="请输入手机号码" clearable></el-input>
         </el-form-item>
         <el-form-item label="养老机构选择" prop="yyLrYljg">
-          <el-input class="yljg-ipt" v-model="form.yyLrYljg" placeholder="请选择养老机构" disabled clearable></el-input>
+          <el-input class="yljg-ipt" v-model="form.yyLrYljg" placeholder="请选择养老机构" disabled></el-input>
           <el-button type="danger" @click="showOrg = true">选 择</el-button>
         </el-form-item>
         <el-form-item label="老人居住地址所在行政区划" prop="lrjzdzxzqh">
-          <el-input v-model="form.lrjzdzxzqh" placeholder="请选择老人居住地址所在行政区划" clearable></el-input>
+          <RegionCascaderSelect v-model="form.lrjzdzxzqh" :checkStrictly="false"></RegionCascaderSelect>
         </el-form-item>
-        <el-form-item label="居住地址描述" prop="lrjzdz">
-          <el-input v-model="form.lrjzdz" placeholder="请输入老人居住地址" clearable></el-input>
+        <el-form-item label="详细地址" prop="lrjzdz">
+          <el-input v-model="form.lrjzdz" type="textarea" maxlength="400" show-word-limit placeholder="请输入老人详细居住地址"></el-input>
         </el-form-item>
         <el-form-item>
           <el-button v-loading="loading" element-loading-background="rgba(255, 255, 255, 0.3)" class="submitBtn"
@@ -61,14 +61,7 @@ let router = useRouter()
 let timer
 
 // 表单数据
-const form = reactive({
-  // xm: '夏洛', // 姓名
-  // zjhm: '220123194808291226', // 证件号码
-  // lrjzdzxzqh: '220102001001', // 居住地行政区划
-  // lrjzdz: '前进大街1000号', // 居住地址
-  // yyLrRzyddh: '15578176756',  // 联系方式
-  // yyLrYljg: '03bc8c3afc1c233a6fd07483193a0014',  // 选择机构
-})
+const form = reactive({})
 // 表单校验规则
 const rules = reactive({
   xm: [

+ 1 - 4
ruoyi-web/src/views/slhgzsq/index.vue

@@ -92,10 +92,7 @@ const search = () => showSearch.value = true
 
 // 查询结果表单相关
 const formRef = ref()
-const form = reactive({
-  tbrXm: '',
-  tbrSjhm: ''
-})
+const form = reactive({})
 const rules = reactive({
   tbrXm: [
     { required: true, message: '请输入申请人姓名', trigger: 'blur' },

+ 6 - 51
ruoyi-web/src/views/slhgzsq/sqzltx/index.vue

@@ -15,23 +15,19 @@
       <el-form v-if="showForm" ref="formRef" class="applyForm" :model="form" :rules="rules" label-width="191px"
         size="large" :inline="true">
         <el-form-item label="改造对象姓名" prop="xm">
-          <el-input v-model="form.xm" placeholder="请输入改造对象姓名" clearable />
+          <el-input v-model="form.xm" placeholder="请输入改造对象姓名" />
         </el-form-item>
         <el-form-item label="改造对象联系电话" prop="lxdh">
-          <el-input v-model="form.lxdh" placeholder="请输入改造对象联系电话" clearable />
+          <el-input v-model="form.lxdh" placeholder="请输入改造对象联系电话" />
         </el-form-item>
         <el-form-item label="改造资金" prop="gzzj">
-          <el-input v-model="form.gzzj" type="number" placeholder="请输入改造资金" clearable></el-input>
-          <!-- <number placeholder="请输入改造资金" v-model="form.gzzj" :min="0" :max="10000000000" :precision="2" /> -->
+          <number placeholder="请输入改造资金" v-model="form.gzzj" :min="0" :max="10000000000" :precision="2" />
         </el-form-item>
         <el-form-item label="其中财政补助资金" prop="czbtzjQt">
-          <el-input v-model="form.czbtzjQt" type="number" placeholder="请输入财政补助资金" clearable></el-input>
-          <!-- <number placeholder="其中财政补助资金" v-model="form.czbtzjQt" :min="0" :max="10000000000" :precision="2" /> -->
+          <number placeholder="其中财政补助资金" v-model="form.czbtzjQt" :min="0" :max="10000000000" :precision="2" />
         </el-form-item>
         <el-form-item label="改造住房地址" prop="zfdz">
-          <!-- <el-input v-model="form.zfdz" placeholder="请输入改造住房地址" clearable></el-input> -->
-          <el-cascader v-model="form.zfdz" :props="props" placeholder="请输入改造住房地址" clearable></el-cascader>
-          <!-- <RegionCascaderSelect v-model="form.zfdz" style="width: 100%"></RegionCascaderSelect> -->
+          <RegionCascaderSelect v-model="form.zfdz" :checkStrictly="false"></RegionCascaderSelect>
         </el-form-item>
         <el-form-item label="详细地址" prop="xxdz">
           <el-input v-model="form.xxdz" type="textarea" maxlength="400" show-word-limit placeholder="请输入详细地址" />
@@ -96,19 +92,7 @@ const { CZ035, CH048, CH049 } = proxy.useDict('CZ035', 'CH048', 'CH049')
 const loading = ref(false)
 const formRef = ref()
 const showForm = ref(true)
-const form = reactive({
-  xm: '夏洛',
-  lxdh: '15512341234',
-  isTsknlr: '1',
-  gzzj: '10000',
-  czbtzjQt: '5000',
-  zfdz: '',
-  xxdz: '详细地址',
-  // sfdm:'01',
-  // gznr:'03',
-  tbrXm: '填报人',
-  tbrSjhm: '15512341234',
-})
+const form = reactive({})
 const rules = reactive({
   xm: [
     { required: true, message: '改造对象姓名不能为空', trigger: 'blur' },
@@ -197,35 +181,6 @@ async function onSubmit(formEl) {
   })
 }
 /* --------表单相关end---------- */
-
-/* --------改造住房地址级联框start---------- */
-const props = {
-  lazy: true,
-  checkStrictly: true,
-  lazyLoad: async (node, resolve) => {
-    const { level } = node
-    let params = level === 0 ? "" : { parentId: node.data.nodeData.id }
-    let response = await CountryDeptList(params)
-    let code = response.code
-    let data = response.data || response.rows
-    if (code !== 200) {
-      this.$message.error("获取行政区划数据失败!")
-      resolve([])
-      return
-    }
-    let res = data.map(item => {
-      let value = String(item["code"])
-      return {
-        label: item.name,
-        value,
-        leaf: level >= 4,
-        nodeData: item
-      }
-    })
-    resolve(res)
-  }
-}
-/* --------改造住房地址级联框end---------- */
 </script>