gx

src/App.vue

@@ -32,8 +32,8 @@ export default {
           userId: 37393,
           name: "124晚6565",
           realName: "梁中全",
-          // idCardNo: "32092219930813831X",
-          idCardNo: "321111198502254219",
+          idCardNo: "342601199503121817",
+          // idCardNo: "321111198502254219",
           // idCardNo: "321183199610151344",
           // idCardNo: "DDfCYHcrBMRhvRt4AQKt+WfGq6l2uT5G",
           // mobileNo: 13776475181,

src/api/policy.js

@@ -6,8 +6,8 @@ import { request2, config2 } from '@/utils/axios'
  * @param {Object} data
  */
 export function departmentList(data) {
-  return request({
-    url: `${config.baseUrl}talent/departmentList`,
+  return request2({
+    url: `${config2.baseUrl}app-api/talent/departmentList`,
     method: 'POST',
     data: data
   })
@@ -31,8 +31,8 @@ export function mattersList(data) {
  * @returns 
  */
 export function mattersGuideList(data){
-  return request({
-    url: `${config.baseUrl}talent/mattersGuideList`,
+  return request2({
+    url: `${config2.baseUrl}app-api/talent/mattersGuideList`,
     method: 'post',
     data: data
   })
@@ -66,8 +66,8 @@ export function mattersGuideGet(data) {
  * 查询报名条件
  */
 export function mattersByUserId(data) {
-  return request({
-    url: `${config.baseUrl}talent/mattersByUserId`,
+  return request2({
+    url: `${config2.baseUrl}app-api/healthy/mattersByUserId`,
     method: 'post',
     data: data
   })
@@ -77,8 +77,8 @@ export function mattersByUserId(data) {
  * 健康管理指南申报
  */
 export function mattersHealthyAdd(data) {
-  return request({
-    url: `${config.baseUrl}talent/mattersHealthyAdd`,
+  return request2({
+    url: `${config2.baseUrl}app-api/healthy/mattersHealthyAdd`,
     method: 'post',
     data: data
   })
@@ -88,8 +88,8 @@ export function mattersHealthyAdd(data) {
  * 健康管理指南申报修改
  */
 export function mattersHealthyUpdate(data) {
-  return request({
-    url: `${config.baseUrl}talent/mattersHealthyUpdate`,
+  return request2({
+    url: `${config2.baseUrl}app-api/healthy/mattersHealthyUpdate`,
     method: 'post',
     data: data
   })
@@ -99,8 +99,8 @@ export function mattersHealthyUpdate(data) {
  * 健康体检申报
  */
 export function mattersInspectAdd(data) {
-  return request({
-    url: `${config.baseUrl}talent/mattersInspectAdd`,
+  return request2({
+    url: `${config2.baseUrl}app-api/healthy/mattersInspectAdd`,
     method: 'post',
     data: data
   })
@@ -110,8 +110,8 @@ export function mattersInspectAdd(data) {
  * 健康体检修改
  */
  export function mattersInspectUpdate(data) {
-  return request({
-    url: `${config.baseUrl}talent/mattersInspectUpdate`,
+  return request2({
+    url: `${config2.baseUrl}app-api/healthy/mattersInspectUpdate`,
     method: 'post',
     data: data
   })
@@ -122,8 +122,8 @@ export function mattersInspectAdd(data) {
  * 绿色就医通道申报
  */
  export function mattersGreenAdd(data) {
-  return request({
-    url: `${config.baseUrl}talent/mattersGreenAdd`,
+  return request2({
+    url: `${config2.baseUrl}app-api/healthy/mattersGreenAdd`,
     method: 'post',
     data: data
   })
@@ -133,8 +133,8 @@ export function mattersInspectAdd(data) {
  * 绿色就医通道修改
  */
  export function mattersGreenUpdate(data) {
-  return request({
-    url: `${config.baseUrl}talent/mattersGreenUpdate`,
+  return request2({
+    url: `${config2.baseUrl}app-api/healthy/mattersGreenUpdate`,
     method: 'post',
     data: data
   })
@@ -144,8 +144,8 @@ export function mattersInspectAdd(data) {
  * 我的申报列表
  */
 export function mattersByUserIdList(data) {
-  return request({
-    url: `${config.baseUrl}talent/mattersByUserIdList`,
+  return request2({
+    url: `${config2.baseUrl}app-api/healthy/mattersByUserIdList`,
     method: 'post',
     data: data
   })
@@ -155,8 +155,8 @@ export function mattersByUserIdList(data) {
  * 申报详情
  */
 export function mattersGet(data) {
-  return request({
-    url: `${config.baseUrl}talent/mattersGet`,
+  return request2({
+    url: `${config2.baseUrl}app-api/healthy/mattersGet`,
     method: 'post',
     data: data
   })
@@ -166,8 +166,8 @@ export function mattersGet(data) {
  * 修改申报单状态
  */
  export function mattersUpdateState(data) {
-  return request({
-    url: `${config.baseUrl}talent/mattersUpdateState`,
+  return request2({
+    url: `${config2.baseUrl}app-api/healthy/mattersUpdateState`,
     method: 'post',
     data: data
   })
@@ -177,8 +177,8 @@ export function mattersGet(data) {
  * 预约医院列表
  */
  export function mattersHospitalList(data) {
-  return request({
-    url: `${config.baseUrl}talent/mattersHospitalList`,
+  return request2({
+    url: `${config2.baseUrl}app-api/healthy/mattersHospitalList`,
     method: 'post',
     data: data
   })
@@ -190,8 +190,8 @@ export function mattersGet(data) {
  * @returns 
  */
 export function mattersParentAdd(data) {
-  return request({
-    url: `${config.baseUrl}talent/mattersParentAdd`,
+  return request2({
+    url: `${config2.baseUrl}app-api/healthy/mattersParentAdd`,
     method: 'post',
     data: data
   })
@@ -203,8 +203,8 @@ export function mattersParentAdd(data) {
  * @returns 
  */
  export function mattersParentUpdate(data) {
-  return request({
-    url: `${config.baseUrl}talent/mattersParentUpdate`,
+  return request2({
+    url: `${config2.baseUrl}app-api/healthy/mattersParentUpdate`,
     method: 'post',
     data: data
   })
@@ -216,8 +216,8 @@ export function mattersParentAdd(data) {
  * @returns 
  */
  export function mattersHousingAdd(data) {
-  return request({
-    url: `${config.baseUrl}talent/mattersHousingAdd`,
+  return request2({
+    url: `${config2.baseUrl}app-api/housing/mattersHousingAdd`,
     method: 'post',
     data: data
   })
@@ -227,8 +227,8 @@ export function mattersParentAdd(data) {
  * 住房契税补贴我的申报列表
  */
  export function mattersHousingList(data) {
-  return request({
-    url: `${config.baseUrl}talent/mattersHousingList`,
+  return request2({
+    url: `${config2.baseUrl}app-api/housing/mattersHousingList`,
     method: 'post',
     data: data
   })
@@ -239,8 +239,8 @@ export function mattersParentAdd(data) {
  * 住房契税补贴申报详情
  */
  export function mattersHousingGet(data) {
-  return request({
-    url: `${config.baseUrl}talent/mattersHousingGet`,
+  return request2({
+    url: `${config2.baseUrl}app-api/housing/mattersHousingGet`,
     method: 'post',
     data: data
   })
@@ -250,8 +250,8 @@ export function mattersParentAdd(data) {
  * 住房契税补贴申报更新
  */
  export function mattersHousingUpdate(data) {
-  return request({
-    url: `${config.baseUrl}talent/mattersHousingUpdate`,
+  return request2({
+    url: `${config2.baseUrl}app-api/housing/mattersHousingUpdate`,
     method: 'post',
     data: data
   })
@@ -261,8 +261,8 @@ export function mattersParentAdd(data) {
  * 住房契税补贴申报状态修改
  */
  export function mattersHousingUpdateState(data) {
-  return request({
-    url: `${config.baseUrl}talent/mattersHousingUpdateState`,
+  return request2({
+    url: `${config2.baseUrl}app-api/housing/mattersHousingUpdateState`,
     method: 'post',
     data: data
   })
@@ -277,8 +277,8 @@ export function mattersArea(data) {
 }
 // 判断是否满足惠老关怀追加
 export function isParentState(data) {
-  return request({
-    url: `${config.baseUrl}talent/mattersSuperAdditionParentState`,
+  return request2({
+    url: `${config2.baseUrl}app-api/healthy/mattersSuperAdditionParentState`,
     method: 'post',
     data: data
   })
@@ -286,8 +286,8 @@ export function isParentState(data) {
 
 // 父母惠老关怀追加
 export function mattersSuperAdditionParent(data) {
-  return request({
-    url: `${config.baseUrl}talent/mattersSuperAdditionParent`,
+  return request2({
+    url: `${config2.baseUrl}app-api/healthy/mattersSuperAdditionParent`,
     method: 'post',
     data: data
   })

src/utils/request.js

@@ -8,7 +8,7 @@ const env = process.env.NODE_ENV === "development" ? "dev" : "prod";
 
 const baseUrl = {
   // dev: "http://192.168.3.144:9090/",
-  dev: "http://81.69.231.72:10010/",
+  dev: "http://81.69.231.72:9090/",
   // dev: "https://www.smart-zj.cn:55901/cert/",
 
   // prod: 'http://81.69.231.72:9090/',

src/views/deedtax/declare.vue

@@ -208,13 +208,6 @@
                     class="add-o"
                     color="#29A400"
                   />
-                  <!-- <div style="display: flex">
-                                        <div>NO.</div>
-                                        <van-field v-model="form.secondDeedBillCode" placeholder="输入契税发票号码"
-                                            input-align="center" :disabled="view" type="digit"
-                                            :rules="[{ required: true, message: '' }]" class="megic megic3">
-                                        </van-field>
-                                    </div> -->
                 </div>
               </template>
             </van-field>
@@ -705,10 +698,12 @@ export default {
       });
       uploadFile(param)
         .then((res) => {
+          // alert(JSON.stringify(res.data))
+
           this.$toast.clear();
           file.status = "done";
           file.message = "上传成功";
-          file.url = res;
+          file.url = res.data;
         })
         .catch((err) => {
           console.log(err);

src/views/deedtax/handling.vue

@@ -540,7 +540,6 @@ import {
   idCardVerification
 } from "@/api/deedtax.js";
 // import { decryptByDES, encryptByDES } from "@/utils/utils";
-import { decryptByDES } from "@/utils/utils";
 
 Vue.use(Button)
   .use(Tab)
@@ -753,10 +752,8 @@ export default {
     jump() {
       idCardVerification({idCard: this.userInfo.idCardNo}).then((res) => {
         if (res.data) {
-          let newCard = decryptByDES(this.userInfo.idCardNo, "MnuYbhGv");
-          console.log(newCard);
           let params = {
-            idCard: newCard,
+            idCard: this.userInfo.idCardNo,
           };
           queryUserApplyForRecord(params).then((res) => {
             console.log(res);
@@ -781,7 +778,7 @@ export default {
                 }).then(() => {
                   queryApplyingDeedTaxInfo({
                     code: "",
-                    idCard: decryptByDES(this.userInfo.idCardNo, "MnuYbhGv"),
+                    idCard: this.userInfo.idCardNo,
                     name: "",
                     pageNum: 1,
                     pageSize: 10,

src/views/deedtax/index.vue

@@ -144,7 +144,6 @@ import {
   queryApplyingDeedTaxInfo,
   idCardVerification
 } from "@/api/deedtax.js";
-import { decryptByDES, encryptByDES } from "@/utils/utils";
 Vue.use(Step)
   .use(Steps)
   .use(Tab)
@@ -174,9 +173,10 @@ export default {
       idCardVerification({idCard: this.userInfo.idCardNo}).then((res) => {
         if (res.data) {
           let params = {
-            idCard: encryptByDES(this.userInfo.idCardNo, "MnuYbhGv"),
+            idCard: this.userInfo.idCardNo,
           };
           queryUserApplyForRecord(params).then((res) => {
+            // alert(JSON.stringify(res))
             if (res.code == 200) {
               if (res.data.state == 0) {
                 this.$router.push({ name: "DeedtaxDeclare" });
@@ -194,7 +194,7 @@ export default {
                 }).then(() => {
                   queryApplyingDeedTaxInfo({
                     code: "",
-                    idCard: decryptByDES(this.userInfo.idCardNo, "MnuYbhGv"),
+                    idCard: this.userInfo.idCardNo,
                     name: "",
                     pageNum: 1,
                     pageSize: 10,
@@ -230,6 +230,8 @@ export default {
             message: "经系统查询，您已享受过相关政策补贴 ，不能再次申报契税补贴政策。如有异议请联系市财政窗口，地址：镇江市政务服务中心（冠城路8号工人大厦）二楼市财政局窗口，联系电话：0511-89881850",
           })
         }
+      }).catch((res) => {
+        alert(JSON.stringify(res))
       })
     },
     change(val) {

src/views/policy/care/careAED.vue

@@ -754,12 +754,12 @@ export default {
         code: this.$route.query.code,
         matterType: 4,
       }).then((res) => {
-        res.registration = [{ url: res.registration }];
-        res.parentList.map((item) => {
+        res.data.registration = [{ url: res.data.registration }];
+        res.data.parentList.map((item) => {
           if (this.type == "continue") {
             item.isShow = false;
           } else {
-            if (res.code == item.basicCode) {
+            if (res.data.code == item.basicCode) {
               item.isShow = true;
             } else {
               item.isShow = false;
@@ -776,8 +776,8 @@ export default {
           item.pickerParentType = false;
           item.pickerParentDiscount = false;
         });
-        res.jurisdiction = res.areaName + "/" + res.streetName;
-        this.form = res;
+        res.data.jurisdiction = res.data.areaName + "/" + res.data.streetName;
+        this.form = res.data;
         console.log(this.form);
         if (this.type == "continue") {
           this.form.registration = [];

src/views/policy/detail.vue

 <template>
   <div class="wrapper">
     <NavHeader color="#0687D2" title="人才事项详情" @back="$router.go(-1)" />
-    <!-- <div
-      :class="[detail.handlingMethod === '1' ? 'contentBu' : 'content']"
-      v-html="detail.notice"
-    >
-      {{ detail.notice }}
-    </div> -->
+
     <img :src="imgUrl" style="width: 100%" />
 
     <div class="title">
@@ -33,7 +28,7 @@ import {
   mattersGuideGet
 } from "@/api/policy";
 import {queryUserApplyForRecord,queryApplyingDeedTaxInfo,idCardVerification} from '@/api/deedtax'
-import { decryptByDES } from "@/utils/utils";
+// import { decryptByDES } from "@/utils/utils";
 
 import imgUrl from "@/assets/policy/banner.png";
 Vue.use(Button).use(Dialog);
@@ -68,9 +63,13 @@ export default {
         message: "加载中..."
       });
       mattersGuideGet({ appId: 1234, id: this.id }).then(res => {
+        if (res.code == 200) {
+
           console.log("详情的res---", res);
           this.$toast.clear();
-        this.detail = res;
+          this.detail = res.data;  
+        }
+        
       });
     },
     report() {
@@ -86,11 +85,11 @@ export default {
       mattersByUserId({
         appId: 1234,
         guideId: this.detail.id,
-        userId: this.userInfo.userId
+        // userId: this.userInfo.userId
       }).then(res => {
         console.log("人才吗的code----", res);
-        sessionStorage.setItem("talentCode", res.talentCode);
-        this.talentCode = res.talentCode
+        sessionStorage.setItem("talentCode", res.data.talentCode);
+        this.talentCode = res.data.talentCode
         this.$toast.clear();
         // console.log(res)
         if (this.detail.matterType === 7) {
@@ -100,13 +99,13 @@ export default {
             query: {
               departmentCode: this.detail.departmentCode,
               guideId: this.detail.id,
-              talentCode: res.talentCode,
+              talentCode: res.data.talentCode,
               matterType: this.detail.matterType,
               type: "add"
             }
           });
         } else {
-          if (!res.mark) {
+          if (!res.data.mark) {
             this.$dialog
               .confirm({
                 message: "您现在还不具备申报该政策的资格，请先申请人才码！",
@@ -118,7 +117,7 @@ export default {
           } else {
             // 已申请人才码
             // 已申请该事项类型
-            if (!res.recordMark) {
+            if (!res.data.recordMark) {
               if (this.detail.matterType === 5 || this.detail.matterType === 6) {
                 this.$router.push({ name: "PolicyReportTwo" });
               }
@@ -128,7 +127,7 @@ export default {
                   query: {
                     departmentCode: this.detail.departmentCode,
                     guideId: this.detail.id,
-                    talentCode: res.talentCode,
+                    talentCode: res.data.talentCode,
                     type: "add"
                   }
                 });
@@ -144,7 +143,7 @@ export default {
                 query: {
                   departmentCode: this.detail.departmentCode,
                   guideId: this.detail.id,
-                  talentCode: res.talentCode,
+                  talentCode: res.data.talentCode,
                   type: "add"
                 }
               });
@@ -155,7 +154,7 @@ export default {
                 query: {
                   departmentCode: this.detail.departmentCode,
                   guideId: this.detail.id,
-                  talentCode: res.talentCode,
+                  talentCode: res.data.talentCode,
                   type: "add"
                 }
               });
@@ -166,7 +165,7 @@ export default {
                 query: {
                   departmentCode: this.detail.departmentCode,
                   guideId: this.detail.id,
-                  talentCode: res.talentCode,
+                  talentCode: res.data.talentCode,
                   type: "add"
                 }
               });
@@ -177,7 +176,7 @@ export default {
                 query: {
                   departmentCode: this.detail.departmentCode,
                   guideId: this.detail.id,
-                  talentCode: res.talentCode,
+                  talentCode: res.data.talentCode,
                   type: "add"
                 }
               });
@@ -190,12 +189,10 @@ export default {
                   let params = {
                     // userId: this.userInfo.userId,
                     // idCard: this.userInfo.idCardNo
-                    idCard: decryptByDES(this.userInfo.idCardNo, "MnuYbhGv")
+                    idCard: this.userInfo.idCardNo
                   }
-                  // alert(JSON.stringify(params))
                   queryUserApplyForRecord(params).then((res) => {
                     console.log(res)
-                    // alert(JSON.stringify(res))
                     if (res.code == 200) {
                       if (res.data.state == 0) {
                         // 人才“镇兴”行动购住房契税补贴(住宅)||人才“镇兴”行动购住房契税补贴(商办)
@@ -216,7 +213,7 @@ export default {
                         }).then(() => {
                           queryApplyingDeedTaxInfo({
                             code: "",
-                            idCard: decryptByDES(this.userInfo.idCardNo, "MnuYbhGv"),
+                            idCard: this.userInfo.idCardNo,
                             name: "",
                             pageNum: 1,
                             pageSize: 10,
@@ -249,7 +246,6 @@ export default {
             }
           }
         }
-
       });
     }
   },
@@ -291,24 +287,6 @@ export default {
     padding-bottom: 500px;
   }
 
-  .contentBu {
-    height: calc(100vh - 193px);
-    padding: 10px;
-    overflow: auto;
-  }
-
-  .content {
-    height: calc(100vh - 108px);
-    padding: 10px;
-    overflow: auto;
-  }
-
-  .buttonWrapper {
-    display: flex;
-    align-items: center;
-    margin-bottom: 100px;
-  }
-
   .bottom-fixed {
     position: fixed;
     left: 0;

src/views/policy/housepurchase.vue

@@ -5,7 +5,7 @@
       title="人才“镇兴”行动购住房契税补贴申请"
       @back="$router.go(-1)"
     />
-    <van-form class="form" @submit="onSubmit" ref="form">
+    <van-form :class="['form',type === 'view' ? 'form1' : 'form2']" @submit="onSubmit" ref="form">
       <div class="section">
         <van-field
           v-if="form.state === 4 && form.refusalCause"
@@ -70,6 +70,30 @@
           :rules="[{ required: true, message: '请填写联系地址' }]"
         />
         <van-field
+          v-model="form.netSignTime"
+          label="网签时间"
+          :disabled="type === 'view'"
+          required
+          readonly
+          placeholder="请选择网签时间"
+          @click="showDatePicker = true"
+        >
+        </van-field>
+        <van-popup
+          v-model="showDatePicker"
+          position="bottom"
+          round
+          v-if="type !== 'view'"
+        >
+          <van-datetime-picker
+            v-model="currentDate"
+            type="date"
+            title="选择网签时间"
+            @confirm="(value) => oncurrentDateConfirm(value)"
+            @cancel="showDatePicker = false"
+          />
+        </van-popup>
+        <van-field
           label="不动产权证号"
           v-model="form.realEstateCard"
           required
@@ -118,6 +142,43 @@
           :rules="[{ required: true, message: '请填写不动产权坐落地址' }]"
         />
         <van-field
+          label="契税发票号码"
+          :disabled="type === 'view'"
+          required
+        >
+          <template #input>
+            <div
+              class="box_megic"
+              style="display:flex;align-items: center;"
+            >
+              <div style="display: flex">
+                <div>NO.</div>
+                <van-field
+                  v-model="form.deedBillCode"
+                  placeholder="输入契税发票号码"
+                  input-align="center"
+                  :disabled="type === 'view'"
+                  type="digit"
+                  :rules="[{ required: true, message: '' }]"
+                  class="megic megic3"
+                >
+                </van-field>
+              </div>
+            </div>
+          </template>
+        </van-field>
+        <van-field
+          v-model="form.paymentDeedTaxAmount"
+          name="缴纳契税金额(元)"
+          label="缴纳契税金额(元)"
+          :disabled="type === 'view'"
+          type="number"
+          clearable
+          required
+          placeholder="输入缴纳契税金额(元)"
+        >
+        </van-field>
+        <van-field
           v-model="form.square"
           label="建筑面积(m²)"
           :disabled="type === 'view'"
@@ -142,6 +203,21 @@
           placeholder="请填写所属银行"
           :rules="[{ required: true, message: '请填写所属银行' }]"
         />
+        <van-field
+          label="上传银行卡(正、反)照"
+          :disabled="type === 'view'"
+          required
+        >
+          <template #input>
+            <van-uploader
+              :disabled="type === 'view'"
+              :deletable="type !== 'view'"
+              :after-read="afterRead"
+              v-model="form.bankimg"
+              max-count="2"
+            />
+          </template>
+        </van-field>
         <van-field :disabled="type === 'view'" label="身份证照片" required>
           <template #input>
             <van-uploader
@@ -233,7 +309,7 @@ import NavHeader from "@/components/NavHeader";
 import { phoneReg } from "@/utils/constant";
 import { decryptByDES } from "@/utils/utils";
 import Vue from "vue";
-import { Form, Field, Popup, Picker, Uploader, Button, Icon } from "vant";
+import { Form, Field, Popup, Picker, Uploader, Button, Icon, DatetimePicker } from "vant";
 import { uploadFile } from "@/api/talents";
 
 import {
@@ -248,7 +324,8 @@ Vue.use(Form)
   .use(Picker)
   .use(Uploader)
   .use(Button)
-  .use(Icon);
+  .use(Icon)
+  .use(DatetimePicker);
 
 export default {
   components: { NavHeader },
@@ -271,10 +348,14 @@ export default {
         // unit: "", // 工作单位
         address: "", // 联系地址
         phone: "", // 手机号码
+        netSignTime: "", // 网签时间
         realEstateCard: "", // 不动产权证号
         realEstateAddress: "", // 不动产权坐落地址
         bankCard: "", // 银行卡号
         bank: "", // 所属银行
+        deedBillCode: "", //契税发票号码
+        paymentDeedTaxAmount: "", // 缴纳契税金额
+        bankimg: [], //银行卡照片
         idCardPicture: [], // 身份证照片
         contract: [], // 商品房买卖合同
         certificate: [], // 不动产权证书
@@ -282,7 +363,10 @@ export default {
         labour: [] // 劳动合同上传项目
       },
       front: "",
-      after: ""
+      after: "",
+      currentDate: new Date(),
+      showDatePicker: false,
+      date: "",
     };
   },
   created() {
@@ -318,28 +402,31 @@ export default {
       mattersHousingGet({ appId: 1234, code: this.code }).then(res => {
         console.log("进页面的第一次调用------", res);
         this.$toast.clear();
-        this.form.refusalCause = res.refusalCause;
-        this.form.state = res.state;
-        this.form.name = res.name;
-        this.form.square = res.square;
-        this.form.bank = res.bank;
-        this.form.bankCard = res.bankCard;
-        this.form.address = res.address;
-        this.form.code = res.code;
-        this.form.housingType = res.housingType;
-        this.form.idCard = res.idCard;
-        this.form.realEstateCard = res.realEstateCard;
-        this.form.realEstateAddress = res.realEstateAddress;
-        this.form.unit = res.unit;
-        this.front = res.realEstateCard.substr(
-          res.realEstateCard.indexOf("("),
-          res.realEstateCard.indexOf(")")
+        this.form.refusalCause = res.data.refusalCause;
+        this.form.state = res.data.state;
+        this.form.name = res.data.name;
+        this.form.square = res.data.square;
+        this.form.bank = res.data.bank;
+        this.form.bankCard = res.data.bankCard;
+        this.form.address = res.data.address;
+        this.form.code = res.data.code;
+        this.form.housingType = res.data.housingType;
+        this.form.idCard = res.data.idCard;
+        this.form.realEstateCard = res.data.realEstateCard;
+        this.form.realEstateAddress = res.data.realEstateAddress;
+        this.form.netSignTime = res.data.netSignTime;
+        this.form.paymentDeedTaxAmount = res.data.paymentDeedTaxAmount;
+        this.form.deedBillCode = res.data.deedBillCode
+        this.form.unit = res.data.unit;
+        this.front = res.data.realEstateCard.substr(
+          res.data.realEstateCard.indexOf("("),
+          res.data.realEstateCard.indexOf(")")
         );
-        this.after = res.realEstateCard.substr(
-          res.realEstateCard.indexOf("第"),
-          res.realEstateCard.indexOf("号")
+        this.after = res.data.realEstateCard.substr(
+          res.data.realEstateCard.indexOf("第"),
+          res.data.realEstateCard.indexOf("号")
         );
-        res.pictureList.forEach(item => {
+        res.data.pictureList.forEach(item => {
           console.log("item---", item);
 
           if (item.pictureType === 1) {
@@ -354,8 +441,10 @@ export default {
             this.form.certificate.push({ url: item.picture });
           } else if (item.pictureType == 6) {
             this.form.voucher.push({ url: item.picture });
-          } else {
+          } else if (item.pictureType == 7)  {
             this.form.labour.push({ url: item.picture });
+          } else if (item.pictureType == 8) {
+            this.form.bankimg.push({ url: item.picture });
           }
         });
       });
@@ -368,7 +457,41 @@ export default {
     //   this.form.realEstateCard =
     //     "苏（" + this.front + "）不动产第" + this.after + "号";
     // },
+    oncurrentDateConfirm(value) {
+      this.date = value;
+      console.log(this.date.getTime());
+      this.form.netSignTime =
+        value.getFullYear() +
+        "-" +
+        (value.getMonth() + 1 > 9
+          ? value.getMonth() + 1
+          : "0" + (value.getMonth() + 1)) +
+        "-" +
+        (value.getDate() > 9 ? value.getDate() : "0" + value.getDate());
+      this.showDatePicker = false;
+    },
     onSubmit() {
+      if (this.form.netSignTime == "") {
+        this.$toast("请选择网签时间");
+        return;
+      }
+      if (this.form.paymentDeedTaxAmount == "") {
+        this.$toast("请输入缴纳契税金额");
+        return;
+      }
+      if (this.form.deedBillCode == "") {
+        this.$toast("请输入契税发票号码");
+        return;
+      } else {
+        if (this.form.deedBillCode.length != 18) {
+          this.$toast("请输入正确的契税发票号码");
+          return;
+        }
+      }
+      if (this.form.bankimg.length < 2) {
+        this.$toast("请上传银行卡(正、反)照");
+        return;
+      }
       if (this.front == "" || this.after == "") {
         this.$toast("请输入正确格式的不动产权坐落地址");
         return;
@@ -414,6 +537,14 @@ export default {
           pictureType: 6,
           picture: this.form.voucher[0].url
         },
+        {
+          pictureType: 8,
+          picture: this.form.bankimg[0].url
+        },
+        {
+          pictureType: 8,
+          picture: this.form.bankimg[1].url
+        },
         ...labour
         // {
 
@@ -429,7 +560,7 @@ export default {
       if (this.type === "add") {
         mattersHousingAdd({ code: this.code, ...parmas }).then(res => {
           this.$toast.clear();
-          this.$toast(res);
+          this.$toast(res.data || '新增成功');
           setTimeout(() => {
             this.$router.go(-1);
           }, 500);
@@ -437,7 +568,7 @@ export default {
       } else if (this.type === "edit") {
         mattersHousingUpdate(parmas).then(res => {
           this.$toast.clear();
-          this.$toast(res);
+          this.$toast(res.data || '修改成功');
           setTimeout(() => {
             this.$router.go(-1);
           }, 500);
@@ -473,8 +604,13 @@ export default {
 </script>
 
 <style lang="stylus" scoped>
-.form {
+.form1{
+  height: calc(100vh - 83px);
+}
+.form2 {
   height: calc(100vh - 173px);
+}
+.form {
   overflow-y: auto;
 
   .reason {
@@ -499,6 +635,9 @@ export default {
     .megic2 {
       width: 150px;
     }
+    .megic3 {
+        width: 300px;
+    }
   }
 }
 </style>

src/views/policy/index.vue

@@ -59,6 +59,7 @@ export default {
       }
       sessionStorage.setItem("ZJCD-UserInfo", res);
       this.userInfo = userInfo;
+      sessionStorage.setItem('token', this.userInfo.token)
     },
     jumpOne() {
       this.$router.push({ name: "PolicyList" });

src/views/policy/list.vue

@@ -79,10 +79,10 @@ export default {
       departmentList({ appId: "1234" }).then(res => {
         console.log("列表的res---", res);
         this.option1 = this.option1.concat(
-          res.map(item => {
+          res.data.map(item => {
             return {
-              text: item.departmentName,
-              value: item.departmentCode
+              text: item.name,
+              value: item.code
             };
           })
         );
@@ -103,20 +103,20 @@ export default {
         appId: 1234,
         departmentCode: this.departmentCode,
         handlingMethod: this.handlingMethod,
-        pageNum: 1,
+        pageNo: 1,
         pageSize: 10
       }).then(res => {
         this.$toast.clear();
         this.refresh = false;
         this.pageNum = 1;
-        const records = res.list;
+        const records = res.data.list;
         if (records.length <= 0) {
           this.list = [];
           this.finished = this.nodata = true;
         } else {
           this.list = records;
           this.nodata = false;
-          this.finished = !res.hasNextPage;
+          this.finished = !res.data.hasNextPage;
         }
       });
     },
@@ -130,18 +130,18 @@ export default {
         appId: 1234,
         departmentCode: this.departmentCode,
         handlingMethod: this.handlingMethod,
-        pageNum: this.pageNum + 1,
+        pageNo: this.pageNum + 1,
         pageSize: 10
       }).then(res => {
         this.$toast.clear();
         this.loading = false;
         this.pageNum = this.pageNum + 1;
-        const records = res.list;
+        const records = res.data.list;
         if (records.length <= 0) {
-          this.finished = true;
+          this.finished = this.nodata = true;
         } else {
           this.list = this.list.concat(records);
-          this.finished = !res.hasNextPage;
+          this.finished = this.nodata =  !res.data.hasNextPage;
         }
       });
     },

src/views/policy/myreport.vue

@@ -132,7 +132,7 @@ export default {
         appId: 1234,
         guideName: this.guideName,
         state: this.list[index].state,
-        pageNum:
+        pageNo:
           type === "refresh" ? 1 : parseInt(this.list[index].pageNum) + 1,
         pageSize: 20,
         userId: encryptByDES(this.userInfo.userId, "MnuYbhGv")
@@ -146,8 +146,8 @@ export default {
         this.$toast.clear();
         this.refreshing = false;
         this.loading = false;
-        const current = res.pageNum;
-        const records = res.list.map((item) => {
+        const current = res.data.pageNum;
+        const records = res.data.list.map((item) => {
           let Obj = policyEnume(item.state);
           item.stateName = Obj.text;
           item.color = Obj.color;
@@ -160,7 +160,7 @@ export default {
               item.pageNum = 1;
             } else {
               item.pageNum = current;
-              item.finished = !res.hasNextPage;
+              item.finished = !res.data.hasNextPage;
               if (type === "refresh") item.content = records;
               else item.content = item.content.concat(records);
             }

src/views/policy/myreportTwo.vue

@@ -76,7 +76,7 @@ import { Tab, Tabs, PullRefresh, List, Search, Button,Dialog } from "vant";
 import { mattersHousingList, mattersHousingUpdateState } from "@/api/policy";
 import { policyEnume } from "@/utils/utils";
 import {queryUserApplyForRecord,queryApplyingDeedTaxInfo,idCardVerification} from '@/api/deedtax'
-import { decryptByDES,encryptByDES } from "@/utils/utils";
+// import { decryptByDES,encryptByDES } from "@/utils/utils";
 
 Vue.use(Tab)
   .use(Tabs)
@@ -103,9 +103,9 @@ export default {
     init(type) {
       let params = {
         appId: 1234,
-        pageNum: type === "refresh" ? 1 : parseInt(this.pageNum) + 1,
+        pageNo: type === "refresh" ? 1 : parseInt(this.pageNum) + 1,
         pageSize: 20,
-        userId: encryptByDES(this.userInfo.userId, "MnuYbhGv")
+        // userId: this.userInfo.userId
       };
       this.$toast.loading({
         duration: 0, // 持续展示 toast
@@ -117,8 +117,8 @@ export default {
         this.$toast.clear();
         this.refreshing = false;
         this.loading = false;
-        const current = res.pageNum;
-        const records = res.list.map(item => {
+        const current = res.data.pageNum;
+        const records = res.data.list.map(item => {
           // this.code = item.code;
           let Obj = policyEnume(item.state);
           item.stateName = Obj.text;
@@ -131,11 +131,11 @@ export default {
           this.pageNum = 1;
         } else {
           this.pageNum = current;
-          this.finished = !res.hasNextPage;
+          this.finished = !res.data.hasNextPage;
           if (type === "refresh") this.list = records;
           else this.list = this.list.concat(records);
         }
-      });
+      })
     },
     onRefresh() {
       this.init("refresh");
@@ -196,12 +196,10 @@ export default {
           let params = {
             // userId: this.userInfo.userId,
             // idCard: this.userInfo.idCardNo
-            idCard: decryptByDES(this.userInfo.idCardNo, "MnuYbhGv")
+            idCard: this.userInfo.idCardNo
           }
-          // alert(JSON.stringify(params))
           queryUserApplyForRecord(params).then((res) => {
             console.log(res)
-            // alert(JSON.stringify(res))
             if (res.code == 200) {
               if (res.data.state == 0) {
                 // 人才“镇兴”行动购住房契税补贴(住宅)||人才“镇兴”行动购住房契税补贴(商办)
@@ -213,16 +211,6 @@ export default {
                     type: "edit"
                   }
                 });
-                // this.$router.push({
-                //   name: "HousePurchase",
-                //   query: {
-                //     departmentCode: this.detail.departmentCode,
-                //     guideId: this.detail.id,
-                //     talentCode: this.talentCode,
-                //     matterType: this.detail.matterType,
-                //     type: "add"
-                //   }
-                // });
               } else if (res.data.state == 1) {
                 Dialog.confirm({
                   confirmButtonText: '查看',
@@ -230,7 +218,7 @@ export default {
                 }).then(() => {
                   queryApplyingDeedTaxInfo({
                     code: "",
-                    idCard: decryptByDES(this.userInfo.idCardNo, "MnuYbhGv"),
+                    idCard: this.userInfo.idCardNo,
                     name: "",
                     pageNum: 1,
                     pageSize: 10,
@@ -244,18 +232,19 @@ export default {
               } else if (res.data.state == 11) {
                 console.log(111)
                 Dialog.confirm({
-                  confirmButtonText: '查看',
+                  // confirmButtonText: '查看',
+                  showConfirmButton: false,
                   message: res.data.msg || '您的申请已提交',
-                }).then(() => {
-                  // this.$router.push({ name: 'PolicyReportTwo', query: { code: res.data.code } })
-                  this.$router.push({
-                    name: "HousePurchase",
-                    query: {
-                      code: record.code,
-                      matterType: record.housingType === 2 ? 5 : 6,
-                      type: "edit"
-                    }
-                  });
+                // }).then(() => {
+                //   // this.$router.push({ name: 'PolicyReportTwo', query: { code: res.data.code } })
+                //   this.$router.push({
+                //     name: "HousePurchase",
+                //     query: {
+                //       code: record.code,
+                //       matterType: record.housingType === 2 ? 5 : 6,
+                //       type: "view"
+                //     }
+                //   });
                 })
               }
             }
@@ -267,6 +256,8 @@ export default {
             message: "经系统查询，您已享受过相关政策补贴 ，不能再次申报契税补贴政策。如有异议请联系市财政窗口，地址：镇江市政务服务中心（冠城路8号工人大厦）二楼市财政局窗口，联系电话：0511-89881850",
           })
         }
+      }).catch((err) => {
+        console.log(err)
       })
     },
     handleChange(index) {

src/views/policy/online.vue

@@ -46,7 +46,7 @@ export default {
       }).then((res) => {
         console.log(res);
         this.$toast.clear();
-        this.list = res.list;
+        this.list = res.data.list;
         if (this.list && this.list.length <= 0) {
           this.nodata = true;
         } else {

src/views/talents/reportform.vue

@@ -527,7 +527,7 @@
               @click="
                 download(
                   'https://www.smart-zj.cn:55901/image/事业工资变动审批表',
-                  'https://www.smart-zj.cn:55901/image/事业工资变动审批表.doc',
+                  'https://www.smart-zj.cn:55901/image/gongzibiandongshenpibiaoIos.doc',
                   '工资变动审批表模板'
                 )
               "