Merge remote-tracking branch 'origin/master'

public/index.html

@@ -8,8 +8,8 @@
   <!-- 技能博物馆 -->
   <!-- <title>OA办公系统</title>
   <link rel="icon" href="<%= BASE_URL %>logo-cd-left1.png"> -->
-  <title>上海萃颠信息科技有限公司</title>
-  <link rel="icon" href="<%= BASE_URL %>logo-cd.png">
+  <title>宁波森语国际贸易有限公司</title>
+  <link rel="icon" href="<%= BASE_URL %>logo-SY.png">
  <!-- <script src="https://cdnjs.cloudflare.com/ajax/libs/babel-polyfill/7.2.5/polyfill.js"></script> -->
   <style>
     html,

src/components/layouts/UserLayout.vue

@@ -100,6 +100,9 @@ export default {
       position: absolute;
       top: -80px;
       left: 42px;
+      img{
+        width: 80px;
+      }
     }
     // 放表单的背景
     .formBox {

src/components/tools/Logo.vue

@@ -14,6 +14,7 @@
       <!-- <img src="~@/assets/logo-cd-left1.png" alt="logo">
       <h1 >OA办公系统</h1>  -->
       <img :src="this.$store.state.logoUrl" alt="logo">
+      <h1 >{{this.$store.state.topTitle}}</h1>
       <!-- <h1 >{{ dashboard }}</h1> -->
     </router-link>
   </div>

src/defaultSettings.js

@@ -24,13 +24,14 @@ export default {
   colorWeak: false,
   multipage: true, //默认多页签模式
   //登陆界面logo
-  imgUrl : require("@assets/logo-blue.png"),
+  imgUrl : require("@assets/logo-SY.png"),
   //首页左上角logo
-   logoUrl : require("@assets/logo-cd-left.png"),
+   logoUrl : require("@assets/logo-SY.png"),
    //菜单样式
    mode:'vertical',
    //文字信息
-   bottonTitle:'上海萃颠信息科技有限公司',
+   bottonTitle:'宁波森语国际贸易有限公司',
+   topTitle:'森语',
   // vue-ls options
   storageOptions: {
     namespace: 'pro__', // key prefix

src/main.js

@@ -78,6 +78,7 @@ new Vue({
         this.$store.state.logoUrl = config.logoUrl
         this.$store.state.bottonTitle = config.bottonTitle
         this.$store.state.mode = config.mode
+        this.$store.state.topTitle = config.topTitle
         store.commit('SET_SIDEBAR_TYPE', Vue.ls.get(SIDEBAR_TYPE, true))
         store.commit('TOGGLE_THEME', Vue.ls.get(DEFAULT_THEME, config.navTheme))
         store.commit('TOGGLE_LAYOUT_MODE', Vue.ls.get(DEFAULT_LAYOUT_MODE, config.layout))

src/store/index.js

@@ -18,7 +18,8 @@ export default new Vuex.Store({
     imgUrl:'',
     logoUrl:'',
     bottonTitle:'',
-    mode:''
+    mode:'',
+    topTitle:''
   },
   mutations: {
 

src/views/activiti/form/demoForm2.vue

@@ -162,7 +162,7 @@ export default {
     },
     created () {
         window.deleteRow = this.deleteRow
-        console.log('流程数据', this.processData)
+        // console.log('流程数据', this.processData)
         // 加载一些下拉选择数据等
         // this.getDataList()
         let businessTable = ''
@@ -379,6 +379,7 @@ export default {
                     if (res.success) {
                         let formData = res.result
                         formData.tableName = r.tableName
+                        // console.log("taboe",formData);
                         this.data = formData
                         // 如果表单是手机端的子表则
                         if (this.isSJ) {
@@ -469,17 +470,17 @@ export default {
                                setTimeout(function(){
                                that.$refs.KFB.setData({[item[0].label]:that.$store.getters.userInfo.username})   
 							   
-							     if(that.processData.businessTable == 'regular_employee_apply'){//员工转正申请
-							       that.$refs.KFB.setData({apply_department:that.deptInfo[that.$store.getters.userInfo.username]})   
-							       that.$refs.KFB.setData({job_title:that.postInfo[that.$store.getters.userInfo.username]})   
-							     }
-							     if(that.processData.businessTable == 'seal_apply'){//用印申请单
-							       that.$refs.KFB.setData({apply_department:that.deptInfo[that.$store.getters.userInfo.username]})   
-							     }
-							     if(that.processData.businessTable == 'separation_application'){//离职申请
-							       that.$refs.KFB.setData({job_title:that.postInfo[that.$store.getters.userInfo.username]})   
-							     }
-							   
+                               if(that.processData.businessTable == 'regular_employee_apply'){//员工转正申请
+                                 that.$refs.KFB.setData({apply_department:that.deptInfo[that.$store.getters.userInfo.username]})   
+                                 // that.$refs.KFB.setData({job_title:that.postInfo[that.$store.getters.userInfo.username]})   
+                               }
+                               if(that.processData.businessTable == 'seal_apply'){//用印申请单
+                                 that.$refs.KFB.setData({apply_department:that.deptInfo[that.$store.getters.userInfo.username]})   
+                               }
+                               if(that.processData.businessTable == 'separation_application'){//离职申请
+                                 that.$refs.KFB.setData({job_title:that.postInfo[that.$store.getters.userInfo.username]})   
+                               }
+                          
 							   
                                   },0)
                                   annualLeave({username:that.$store.getters.userInfo.username}).then(res => {
@@ -610,10 +611,12 @@ export default {
          },
         // 表单字段数值发生改变事件
         handleChange (value, key) {  
-			if(key == 'proposer' && this.processData.businessTable == 'regular_employee_apply'){//员工转正申请
-			  this.$refs.KFB.setData({apply_department:this.deptInfo[value]})   
-			  this.$refs.KFB.setData({job_title:this.postInfo[value]})   
-			}
+          if(key == 'proposer' && this.processData.businessTable == 'regular_employee_apply'){//员工转正申请：申请人部门
+            this.$refs.KFB.setData({apply_department:this.deptInfo[value]})   
+          }
+          if(key == 'regular_employee' && this.processData.businessTable == 'regular_employee_apply'){//员工转正申请：转正人员岗位
+            this.$refs.KFB.setData({job_title:this.postInfo[value]})   
+          }
           if(key == 'proposer' && this.processData.businessTable == 'seal_apply'){//用印申请单
             this.$refs.KFB.setData({apply_department:this.deptInfo[value]})   
           }
@@ -705,6 +708,8 @@ export default {
             // 通过函数获取数据
             this.$refs.KFB.getData()
                 .then(res => {
+                  let formData1 = JSON.parse(JSON.stringify(res))
+                  console.log("orl",formData1)
                     // 处理手机端子表数据
                     if (this.isSJ) {
                         this.itemData(res)

src/views/activiti/form/materialSlModal.vue

@@ -177,7 +177,6 @@ export default {
     personLists(value){
       getGoods({tableName:'material_apply'}).then(res => {
                     if (res.success) {
-                      debugger
                       this.materialSlData = res.result
                     }else{
                        this.$message.error(res.message);

src/views/oa/my-plan/add/savePlan.vue

@@ -253,6 +253,7 @@ export default {
                                 this.$message.success('新增成功')
                                 this.addForm.resetFields() // 清空表单
                                 this.$refs.JEditor.myValue = ''
+                                this.fatherMethod()
                             }
                         })
                     }

src/views/system/UserAnnouncementList.vue

@@ -15,8 +15,17 @@
               <a-input placeholder="请输入发布人" v-model="queryParam.sender"></a-input>
             </a-form-item>
           </a-col>
+          <a-col :span="6">
+            <a-form-item label="阅读状态">
+              <a-select v-model="queryParam.readFlag" placeholder="请选择" :allowClear="true">
+                <a-select-option value="0">未读</a-select-option>
+                <a-select-option value="1">已读</a-select-option>
+                <a-select-option value="">全部</a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
 
-          <a-col :span="8" >
+          <a-col :span="6" >
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
               <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
               <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
@@ -66,7 +75,9 @@
     data () {
       return {
         description: '系统通告表管理页面',
-        queryParam: {},
+        queryParam: {
+          readFlag:'0'
+        },
         columns: [{
           title: '标题',
           align:"center",

src/views/system/UserList.vue

@@ -325,7 +325,7 @@
       handleOk() {
         let ids = "";
         let that = this;
-        if(this.gongJiJin == '' || this.sheBao == ''){
+        if(this.gongJiJin == '' && this.sheBao == ''){
           this.$message.warning('请填写要修改的数据！');
           return false;
         }else{

src/views/system/modules/AddressListRight.vue

@@ -28,7 +28,7 @@
     </div>
 
     <div class="table-operator" style="border-top: 5px">
-      <a-button @click="handleDelete" type="primary" icon="hdd">删除</a-button>
+      <a-button @click="handleDelete" type="primary" icon="hdd" v-has='"address:delete"'>删除</a-button>
     </div>
 
     <a-table