修改与新增8.11所提功能

api/oaUser.js

@@ -20,6 +20,11 @@ export const userCenter = (data) => oahttp.get('/user/center', data)
  */
 export const userInfo = (data) => oahttp.get('/user/info', data)
 
+/**
+ * 修改密码
+ */
+export const changePassword = (data) => oahttp.post('/user/changePassword', data)
+
 /**
  * 新增人员
  */

components/company/company.vue

@@ -20,7 +20,7 @@
               <uni-icons type="location" color="#666666" size="14"></uni-icons>
               <view class="location">区域：</view>
             </view>
-            <view style="flex: 1;">{{company.address}}</view>
+            <view style="flex: 1;">{{c_address}}</view>
           </view>
         </view>
       </block>
@@ -163,6 +163,23 @@
     mounted() {
       this.initContract(this.$props.id, this.$props.type || null);
     },
+    computed:{
+      c_address(){
+        let str = '';
+        if(this.company.company_type==16){
+          this.company?.province_name?str+=this.company?.province_name:null;
+          this.company?.city_name?str+=this.company?.city_name:null;
+          this.company?.area_name?str+=this.company?.area_name:null;
+          this.company?.street_name?str+=this.company?.street_name:null;
+        }else {
+          this.company?.street_name?str+=this.company?.street_name:null;
+          this.company?.village_name?str+=this.company?.village_name:null;
+          this.company?.brigade_name?str+=this.company?.brigade_name:null;
+          
+        }
+        return str;
+      }
+    },
     methods: {
       navTo(contract_no) {
         download_file({ applyNo: contract_no }).then(res => {

pages.json

@@ -118,8 +118,16 @@
         "navigationBarTextStyle": "white"
       }
 
+    }, {
+      "path": "pages/updatePasswprd/updatePasswprd",
+      "style": {
+        "navigationBarTitleText": "修改密码",
+        "enablePullDownRefresh": false,
+        "navigationBarBackgroundColor": "#3175f9",
+        "navigationBarTextStyle": "white"
       }
 
+    }
   ],
   "subPackages": [{
     "root": "pages/views",

pages/oaLogin/oaLogin.vue

@@ -79,9 +79,21 @@ import { Toast } from "../../libs/uniApi";
         let { data } = await userInfo();
         this.$store.commit('setUserInfo', data);
         uni.hideLoading()
-        uni.switchTab({
+        if(data.is_new_user) {
-          url: '/pages/oaHome/oaHome'
+          uni.showLoading({
+            mask:true,
+            title:'加载中'
           })
+          uni.switchTab({
+            url:'/pages/oaHome/oaHome',
+            success: () => {
+              uni.hideLoading()
+            }
+          })
+        }
+        else uni.navigateTo({
+          url: '/pages/updatePasswprd/updatePasswprd'
+        });
       },
       initTerminal() {
         // #ifndef APP-PLUS

pages/updatePasswprd/updatePasswprd.vue

@@ -0,0 +1,96 @@
+<template>
+  <view class="reset-password">
+    <u--form ref="formRef" :rules="rules" :model="formData">
+      <u-form-item label="原密码" labelWidth="140rpx" borderBottom prop="old_password">
+        <u--input v-model="formData.old_password" type="password" placeholder="请输入原密码" maxlength="18"></u--input>
+      </u-form-item>
+      <u-form-item label="新密码" labelWidth="140rpx" borderBottom prop="password">
+        <u--input v-model="formData.password" type="password" placeholder="请输入新密码" maxlength="18"></u--input>
+      </u-form-item>
+      <u-form-item label="确认密码" labelWidth="140rpx" borderBottom prop="password_confirm">
+        <u--input v-model="formData.password_confirm" type="password" placeholder="请确认新密码" maxlength="18"></u--input>
+      </u-form-item>
+      <u-button style="margin-top: 28rpx;background-color: #3175f9;color: #fff;" @click="submit">提交</u-button>
+    </u--form>
+  </view>
+</template>
+
+<script>
+import { Toast } from '../../libs/uniApi';
+import { changePassword } from "@/api/oaUser.js"
+export default {
+  data() {
+    return {
+      formData:{
+        old_password: '', // 原密码
+        password: '', // 新密码
+        password_confirm: '', // 确认密码
+      },
+      rules:{
+        old_password: {
+          type: 'string',
+          required: true,
+          min: 6,
+          max: 18,
+          message: '请输入6-18位密码',
+          trigger: ['change', 'blur']
+        },
+        password: {
+          type: 'string',
+          required: true,
+          min: 6,
+          max: 18,
+          message: '请输入6-18位密码',
+          trigger: ['change', 'blur']
+        },
+        password_confirm: {
+          type: 'string',
+          required: true,
+          min: 6,
+          max: 18,
+          message: '请输入6-18位密码',
+          trigger: ['change', 'blur']
+        },
+      }
+    }
+  },
+  methods: {
+    submit() {
+      this.$refs.formRef.validate().then(async (e)=>{
+        if(e){
+          if(this.formData.password == this.formData.old_password) return Toast('新密码不能与原密码一致');
+          if(this.formData.password !== this.formData.password_confirm) return Toast('两次新密码不一致');
+          try{
+            await changePassword({...this.formData});
+            Toast('修改成功');
+            this.$u.sleep(500).then(()=>{
+              uni.showLoading({
+                mask:true,
+                title:'加载中'
+              })
+              uni.switchTab({
+                url:'/pages/oaHome/oaHome',
+                success: () => {
+                  uni.hideLoading()
+                }
+              })
+            })
+          }catch(e){
+            // console.log(e);
+            Toast(e.msg||'修改失败')
+          }
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style>
+.reset-password {
+  margin: 28rpx;
+  padding: 28rpx;
+  background-color: #fff;
+  border-radius: 14rpx;
+}
+</style>

static/server/server.js

@@ -392,6 +392,11 @@ export const myOaData = [
     icon: '../../static/icons/manager.png',
     url: '/pages/oaManager/oaManager'
   },
+  {
+    name: '安全设置',
+    icon: '../../static/icons/setting.png',
+    url: '/pages/updatePasswprd/updatePasswprd'
+  },
   // {
   //   name: '管理后台',
   //   icon: 'custom-icongongzi',

subpkg/companySign/companySign.vue

@@ -11,7 +11,7 @@
         <button class="btn tips_center">合同已生成,请等待审核</button>
         <!-- <mybtn text="生成合同" position="false" disabled></mybtn> -->
       </view>
-      <view v-if="company.contract&&company.contract.check_status==2" class="card">
+      <view v-if="company.contract&&company.contract.check_status==2&&company.contract.file" class="card">
         <view class="contract_box send">
           <view class="left">
             <image class="contract_img" src="../../static/img/contract/pdf.png"></image>
@@ -22,6 +22,11 @@
               </view>
             </view>
           </view>
+          <view class="right" @click="naviToContract(company.contract.file)">
+            <!-- <image class="icon"></image> -->
+            <uni-icons type="paperclip" color="#3274F9"></uni-icons>
+            <view>查看</view>
+          </view>
         </view>
         <u-line color="#999999FF" style="margin: 31rpx 0;"></u-line>
         <view class="bottom">
@@ -101,6 +106,12 @@
           type: 1 //1-公司,2-个人
         })
       },
+      // 查看合同
+      naviToContract(file) {
+        uni.navigateTo({
+          url: `/subpkg/pdfView/pdfView?url=${file}`
+        })
+      },
       // 初始化合同类型
       async initContractTypeList() {
         let res = await dictDataLists({
@@ -110,6 +121,13 @@
       },
       // 生成合同
       async createContract(data) {
+        uni.showModal({
+          content: '请检查信息无误后再生成合同',
+          confirmText: '确认无误',
+          cancelText: '我再看看',
+          confirmColor: '#3175f9',
+          success: async (e) => {
+            if (e.confirm) {
               uni.showLoading({
                 title:'合同生成中',
                 mask: true
@@ -121,10 +139,21 @@
               })
               this.initCompany();
               uni.hideLoading();
-        Toast(res.msg || '合同已生成')
+              Toast(res.msg || '合同已生成');
+              this.navTo('/subpkg/submit/submit?type=' + 1);
+            }
+          }
+        })
       },
       // 发送合同
       async addContract(data) {
+        uni.showModal({
+          content: '请检查合同无误后再发送',
+          confirmText: '确认无误',
+          cancelText: '我再看看',
+          confirmColor: '#3175f9',
+          success: async (e) => {
+            if (e.confirm) {
               try{
                 uni.showLoading({
                   title:'合同发送中',
@@ -134,26 +163,36 @@
                   id: this.id
                 });
                 this.initCompany();
-          if (this.userInfo.contract.check_status == 3) {
                 this.startTimer();
-          }
                 uni.hideLoading();
                 Toast('合同已发送');
-          this.navTo('/subpkg/submit/submit');
+                // this.navTo('/subpkg/submit/submit');
               }catch(e){
                 uni.hideLoading();
                 Toast(e.msg||'合同发送失败');
               }
+            }
+          }
+        })
       },
       // 发送短信
       async getPostsms() {
+        try {
+          uni.showLoading({
+            title: '发送中',
+            mask: true
+          })
           if (this.timerCount == 0) {
             this.startTimer();
             let res = await postsms({
               id: this.id
             })
             Toast('短信已发送');
-          this.navTo('/subpkg/submit/submit');
+            // this.navTo('/subpkg/submit/submit');
+          }
+        } catch (e) {
+          uni.hideLoading();
+          Toast(e.msg || '合同发送失败');
         }
       },
       // 定时器

subpkg/companyUnsign/companyUnsign.vue

@@ -17,13 +17,14 @@
             <view @click="copyPhone(item.master_phone)">联系方式：{{item.master_phone}}</view>
             <view style="display: flex;">
               <view class="">区县乡镇：</view>
-              <view>{{item.city_name+'/'+item.area_name+'/'+item.street_name}}</view>
+              <view>{{c_address(item)}}</view>
             </view>
             <!-- <view>片区经理：</view> -->
           </view>
         </view>
       </view>
-      <u-empty v-if="loadConfig.status=='nomore'&& companyList.length==0" text="没有更多公司" icon="/static/img/empty/data.png"></u-empty>
+      <u-empty v-if="loadConfig.status=='nomore'&& companyList.length==0" text="没有更多公司"
+        icon="/static/img/empty/data.png"></u-empty>
       <u-loadmore v-else :status="loadConfig.status" :loading-text="loadConfig.loadingText"
         :loadmore-text="loadConfig.loadmoreText" :nomore-text="loadConfig.nomoreText" />
     </view>
@@ -94,6 +95,21 @@ export default {
           }
         })
       },
+      // 根据公司类型显示地区
+      c_address(company) {
+        let str = '';
+        if (company.company_type == 16) {
+          company?.province_name ? str += company?.province_name : null;
+          company?.city_name ? str += company?.city_name : null;
+          company?.area_name ? str += company?.area_name : null;
+          company?.street_name ? str += company?.street_name : null;
+        } else {
+          company?.street_name ? str += company?.street_name : null;
+          company?.village_name ? str += company?.village_name : null;
+          company?.brigade_name ? str += company?.brigade_name : null;
+        }
+        return str;
+      }
     },
     onPullDownRefresh() {
       uni.stopPullDownRefresh()

subpkg/personnelDetails/personnelDetails.vue

@@ -106,14 +106,17 @@
             </image>
           </view>
         </view>
-        <view class="c_item">
+        <view class="c_item"
+          v-if="userInfo.qualification&&userInfo.qualification.car_card||(userInfo.qualification&&userInfo.qualification.car_card)">
           <uni-section style="background-color: transparent;" title="驾驶证" titleFontSize="32rpx" type="line">
           </uni-section>
           <view class="card_box">
-            <image :src="userInfo.qualification&&userInfo.qualification.car_card"
+            <image v-if="userInfo.qualification&&userInfo.qualification.car_card"
+              :src="userInfo.qualification&&userInfo.qualification.car_card"
               @click="previewImg([userInfo.qualification&&userInfo.qualification.car_card,userInfo.qualification&&userInfo.qualification.car_card_b], 0)">
             </image>
-            <image :src="userInfo.qualification&&userInfo.qualification.car_card_b"
+            <image v-if="userInfo.qualification&&userInfo.qualification.car_card"
+              :src="userInfo.qualification&&userInfo.qualification.car_card_b"
               @click="previewImg([userInfo.qualification&&userInfo.qualification.car_card,userInfo.qualification&&userInfo.qualification.car_card_b], 1)">
             </image>
           </view>
@@ -165,12 +168,17 @@
             <view class="left">
               <image class="contract_img" src="../../static/img/contract/pdf.png"></image>
               <view class="text">
-                <view class="name">{{userInfo.contract.contract_type_name}}</view>
+                <view class="name">{{userInfo.contract.contract_type_name||'合同'}}</view>
                 <view>
                   <text>{{userInfo.contract&&userInfo.contract.create_time}}</text>
                 </view>
               </view>
             </view>
+            <view class="right" @click="naviToContract(userInfo.contract.contract_no)">
+              <!-- <image class="icon"></image> -->
+              <uni-icons type="paperclip" color="#3274F9"></uni-icons>
+              <view>查看</view>
+            </view>
           </view>
           <u-line color="#999999FF" style="margin: 31rpx 0;"></u-line>
           <view class="bottom">
@@ -269,7 +277,9 @@
       }
     },
     methods: {
+      // 查看合同
       naviToContract(contract_no) {
+        if (this.userInfo.is_contract) {
           download_file({
             applyNo: contract_no
           }).then(res => {
@@ -280,6 +290,9 @@
               url: `/subpkg/pdfView/pdfView?url=${res.data.url}`
             })
           })
+        } else uni.navigateTo({
+          url: `/subpkg/pdfView/pdfView?url=${this.userInfo?.contract?.file}`
+        })
       },
       navTo(url) {
         url ?
@@ -322,7 +335,14 @@
         this.contractTypeList = res.data;
       },
       // 生成合同
-      async createContract(data) {
+      createContract(data) {
+        uni.showModal({
+          content: '请检查信息无误后再生成合同',
+          confirmText: '确认无误',
+          cancelText: '我再看看',
+          confirmColor: '#3175f9',
+          success: async (e) => {
+            if (e.confirm) {
               uni.showLoading({
                 title: '合同生成中',
                 mask: true
@@ -335,9 +355,20 @@
               this.loadUserDetail();
               uni.hideLoading();
               Toast('合同已生成');
+              this.navTo('/subpkg/submit/submit?type=' + 1);
+            }
+          }
+        })
       },
       // 发送合同
       async addContract(data) {
+        uni.showModal({
+          content: '请检查合同无误后再发送',
+          confirmText: '确认无误',
+          cancelText: '我再看看',
+          confirmColor: '#3175f9',
+          success: async (e) => {
+            if (e.confirm) {
               try {
                 uni.showLoading({
                   title: '合同发送中',
@@ -347,16 +378,17 @@
                   id: this.userInfo.id
                 });
                 this.loadUserDetail();
-          if (this.userInfo.contract.check_status == 3) {
                 this.startTimer();
-          }
                 uni.hideLoading();
                 Toast('合同已发送');
-          this.navTo('/subpkg/submit/submit');
+                // this.navTo('/subpkg/submit/submit?type='+2);
               } catch (e) {
                 uni.hideLoading();
                 Toast(e.msg || '合同发送失败');
               }
+            }
+          }
+        })
       },
       // 发送短信
       async getPostsms() {
@@ -372,7 +404,7 @@
             })
             uni.hideLoading();
             Toast('短信已发送');
-            this.navTo('/subpkg/submit/submit');
+            // this.navTo('/subpkg/submit/submit?type='+3);
           }
         } catch (e) {
           uni.hideLoading();