Browse Source

添加登记年度、登记时段

sunkuosheng 1 week ago
parent
commit
b8b9b9780c

+ 1 - 1
ruoyi-ui-gljt/src/utils/constant.js

@@ -15,7 +15,7 @@ export const Constant = {
   'jlCode':'220000000000',
   //打印调整URL
   'DY_URL':'https://jdgl.ccsckj.com/printsvr', //测试
-  // 'DY_URL':'https://info.windd.cn/printsvr' //正式
+  // 'DY_URL':'https://info.windd.cn/printsvr' ,//正式
 
   //mqtt上传的图片地址是否是正式
   'IS_ZS':"0" //测试

+ 23 - 22
ruoyi-ui-gljt/src/views/gljt/gljtSq/index.vue

@@ -1378,9 +1378,9 @@ export default {
       options: {
         connectTimeout: 6000, // 超时时间
         clientId: "znyl_" + getUuid(),
-        endpoint: "/mqtt",
-        host: "121.36.73.159",
-        port: 8083,
+        // endpoint: "/mqtt",
+        // host: "jdgl.ccsckj.com",
+        // port: 443,
         username: "admin", // 用户名
         password: "sckj@2023", // 密码
         cleanSession: false,
@@ -1880,23 +1880,20 @@ export default {
   },
   created() {
     this.getList();
-    console.log(this.user.qxpz,'<---------qxpz');
+    // console.log(this.user.qxpz,'<---------qxpz');
   },
   methods: {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.id)
-      console.log(this.ids,'this.ids');
       this.multiple = !selection.length
     },
     // 多选框选中数据
     handleSelectionChange2(selection) {
       this.multipleSelection = selection;
       this.changeFfje();
-      console.log(this.multipleSelection,'<--------this.multipleSelection');
     },
     changeFfje(){
-      console.log('我变化了');
       let sum=0;
       this.multipleSelection.map(item=>{
         sum+= Number(item.ffje)
@@ -1915,8 +1912,9 @@ export default {
       let that = this;
       try {
         this.client = mqtt.connect(
-          "ws://121.36.73.159:8083/mqtt",
-          // "ws://121.36.73.99:8183/mqtt",
+          // "wss://121.36.73.159:8083/mqtt",
+          "wss://jdgl.ccsckj.com/mqtt",
+          // "ws://121.36.73.159:8083/mqtt",
           this.options
         );
       } catch (error) {
@@ -1978,7 +1976,7 @@ export default {
         let msgobj = JSON.parse(message.toString());
         if (msgobj.params.picadata1) {
           this.clearTime();
-          console.log(msgobj.params.ywlx,'msgobj.params.ywlx');
+          // console.log(msgobj.params.ywlx,'msgobj.params.ywlx');
           if (msgobj.params.lx === "sfz") {
              //身份证正面
              if(msgobj.params.picadata1) {
@@ -2048,7 +2046,7 @@ export default {
           }
           if (msgobj.params.lx === "rx") {
             this.form.tx = msgobj.params.picadata2;
-            console.log(this.form, "<-----我是form");
+            // console.log(this.form, "<-----我是form");
             // this.form.tx='/gljtUploadPath/2025/02/17/43d9cbd0ecfe11efa4fd03c1431ab362_20250217151027A056.png';
 
           }
@@ -2056,7 +2054,7 @@ export default {
             //户口本首页
             if(msgobj.params.picadata1){
              let data=await this.household_registerIdentify(msgobj.params.picadata1,'homepage')
-              console.log(data,'户口本首页');
+              // console.log(data,'户口本首页');
               if(!data.words_result){
                 this.$modal.msgError(`请上传正确的户口本首页`);
                 return;
@@ -2066,7 +2064,7 @@ export default {
             //户口本本人页
             if(msgobj.params.picbdata1){
               let qur=await this.household_registerIdentify(msgobj.params.picbdata1,'subpage')
-              console.log(qur,'户口本本人页');
+              // console.log(qur,'户口本本人页');
               if(qur.words_result&&qur.words_result['CardNo']&&qur.words_result['Name']){
                 if(this.form.sqrZjhm&&(this.form.sqrZjhm!= qur.words_result['CardNo'].words)){
                   // if(this.opt&&this.opt.sqrZjhm&&this.opt.sqrXm&&(this.opt.sqrZjhm!= qur.words_result['CardNo'].words||this.opt.sqrXm!=qur.words_result['Name'].words)){
@@ -2200,7 +2198,7 @@ export default {
       }
       this.isZz = false;
       this.divmsgtime = null; // 更新页面上的显示为结束信息
-      console.log("清空");
+      // console.log("清空");
     },
     QRSFZ(lx,ywlx) {
       this.openRwm = true;
@@ -2293,7 +2291,7 @@ export default {
       this.isJy = false;
       //如果是低保切换的话不需要调整补贴列表和当发月份的限制
       if (res.data.default&&!(is&&is=='true')) {
-        console.log(res.data,'res.data');
+        // console.log(res.data,'res.data');
         this.form.ffyf = res.data.default;
         this.clearBfxx();
         // this.getBfys();
@@ -2301,7 +2299,7 @@ export default {
           this.upper = new Date(
             res.data.under.slice(0, 4) + "-" + res.data.under.slice(-2)
           ).getTime();
-          console.log( this.upper,'<------ this.upper');
+          // console.log( this.upper,'<------ this.upper');
         }
       }
     },
@@ -2344,7 +2342,7 @@ export default {
           this.form.ffyf = res.data.default;
         }
         if (res.data.under && res.data.under.length >= 6) {
-          console.log(res.data.under, "this.upper时间");
+          // console.log(res.data.under, "this.upper时间");
           this.upper = new Date(
             res.data.under.slice(0, 4) + "-" + res.data.under.slice(-2)
           ).getTime();
@@ -2399,7 +2397,7 @@ export default {
             });
           })
         }
-        console.log(res,'我是列表');
+        // console.log(res,'我是列表');
       }
     },
     getTime() {
@@ -2430,7 +2428,7 @@ export default {
       });
     },
     getCard(data) {
-      console.log(data, "<--------身份证正面");
+      // console.log(data, "<--------身份证正面");
       if (data && data.sqrZjhm) {
         // if(this.cardNo&&this.hkbName&&(data.sqrZjhm!= this.cardNo||data.sqrXm!=this.name))
         // {
@@ -2491,7 +2489,7 @@ export default {
       }
     },
     getSubpage(data) {
-      console.log(data, "户口本");
+      // console.log(data, "户口本");
       if (data && data.cardNo) {
         this.cardNo = data.cardNo;
         this.hkbName = data.name;
@@ -2748,7 +2746,6 @@ export default {
             this.getAccessToken();
             this.getQxBfPz('true');
             this.getBfys();
-            this.createConnection();
           }
           //街道审核
           if(this.status == "1"){
@@ -2772,6 +2769,10 @@ export default {
           this.form.sqbfj = response.data.sqbfj;
           this.title = "上传附件";
         }
+        //草稿、被拒绝、社区审核
+        if (this.status == "4" || this.status == "0" || this.status == "50") {
+          this.createConnection();
+        }
       });
     },
     //缓存各级的审批人
@@ -2999,7 +3000,7 @@ export default {
       });
     },
     submitForm3() {
-      console.log(this.ids,'<---------this.ids');
+      // console.log(this.ids,'<---------this.ids');
       this.$refs["form3"].validate((valid) => {
         if (valid) {
           addGljtSqGstp({ gszp: this.form.gszp, idList:this.ids })

+ 37 - 0
ruoyi-ui-gljt/src/views/gljtcx/jkdjjlcx/index.vue

@@ -38,6 +38,22 @@
               </el-option>
             </el-select>
           </el-form-item>
+
+          <el-form-item label="登记年度" prop="nd">
+            <el-date-picker
+              v-model="queryParams.nd"
+              value-format="yyyy"
+              type="year"
+              style="width: 215px"
+              placeholder="选择年">
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item label="登记时段" prop="jcsd">
+            <el-select v-model="queryParams.jcsd" placeholder="请选择登记时段" clearable>
+              <el-option v-for="dict in jcsdOpt" :key="dict.value" :label="dict.label" :value="dict.value">
+              </el-option>
+            </el-select>
+          </el-form-item>
           <el-form-item label="验活时间" prop="ffsj">
             <el-date-picker v-model="daterangeFfsj"  style="width: 541px"  value-format="yyyyMMddHHmmss" type="datetimerange"
                             range-separator="-" start-placeholder="开始时间" end-placeholder="结束时间"></el-date-picker>
@@ -283,7 +299,10 @@
           pageNum: 1,
           pageSize: 10,
           kz4:'',
+          nd:'',
+          jcsd:'',
         },
+        jcsdOpt:[],
         dictOpt:[
           {value:'0',label:'自动'},
           {value:'1',label:'人工'}
@@ -338,6 +357,24 @@
       };
     },
     created() {
+      this.queryParams.nd = new Date().getFullYear().toString();
+      console.log(this.queryParams.nd,'this.queryParams.nd');
+      // console.log(this.user.qxpz.kz4,'<---------qxpz');
+      if(this.user.qxpz&&this.user.qxpz.kz4){
+        let dataArr=[];
+        let res=this.user.qxpz.kz4.split(",")
+        if(res&&res.length>0){
+          res.map(item=>{
+            const target = "&";
+            const result = item.substring(item.indexOf(target)+1);
+            dataArr.push({
+              label:result,value:result
+            })
+          })
+        }
+      this.jcsdOpt=dataArr;
+        // this.user.qxpz.kz4
+      }
       this.getList();
     },
     methods: {