代码更新

src/HDrpManagement/payvoucher/details/modules/detailedData.vue

@@ -16,7 +16,7 @@
         <el-descriptions-item label="凭证来源">{{ detailData.source?detailData.source:"--" }}</el-descriptions-item>
         <el-descriptions-item label="凭证来源说明">{{ detailData.sourcenote?detailData.sourcenote:"--" }}</el-descriptions-item>
         <el-descriptions-item label="备注">{{ detailData.remarks?detailData.remarks:"--" }}</el-descriptions-item>
-        <el-descriptions-item label="创建人">{{ detailData.changeby?detailData.changeby:"--" }}</el-descriptions-item>
+<!--        <el-descriptions-item label="创建人">{{ detailData.changeby?detailData.changeby:"&#45;&#45;" }}</el-descriptions-item>-->
       </el-descriptions>
     </div>
 

src/HDrpManagement/recvoucher/details/modules/detailedData.vue

@@ -17,7 +17,7 @@
         <el-descriptions-item label="凭证来源">{{ detailData.source?detailData.source:"--" }}</el-descriptions-item>
         <el-descriptions-item label="凭证来源说明">{{ detailData.sourcenote?detailData.sourcenote:"--" }}</el-descriptions-item>
         <el-descriptions-item label="备注">{{ detailData.remarks?detailData.remarks:"--" }}</el-descriptions-item>
-        <el-descriptions-item label="创建人">{{ detailData.changeby?detailData.changeby:"--" }}</el-descriptions-item>
+<!--        <el-descriptions-item label="创建人">{{ detailData.changeby?detailData.changeby:"&#45;&#45;" }}</el-descriptions-item>-->
       </el-descriptions>
     </div>
 

src/HManagement/department/index.vue

@@ -37,7 +37,10 @@
         <div slot="custom"></div>
         <template v-slot:tbList="scope">
           <div>
-            <p v-if="scope.data.column.columnname === 'province'">
+            <div v-if="scope.data.column.columnname === 'phonenumber'">
+              <span>{{scope.data.column.data.accountno !== '' ? scope.data.column.data.userphonenumber : scope.data.column.data.phonenumber}}</span>
+            </div>
+            <p v-else-if="scope.data.column.columnname === 'province'">
               {{`${scope.data.column.data.province}-${scope.data.column.data.city}-${scope.data.column.data.county}`}}
             </p>
             <p v-else>{{scope.data.column.data[[scope.data.column.columnname]]?scope.data.column.data[[scope.data.column.columnname]]:'--'}}</p>

src/HManagement/department/staff/detail/index.vue

@@ -18,7 +18,7 @@
       </div>
       <div slot="customOperation" >
         <linkAccount class="inline-16" v-if="tool.checkAuth($route.name,'update')"  :data="mainData"  @onSuccess="queryMainData"></linkAccount>
-<!--        <createUser class="inline-16" v-if="tool.checkAuth($route.name,'update') && !mainData.userid" :data="mainData"  @onSuccess="queryMainData"></createUser>-->
+        <createUser class="inline-16" v-if="tool.checkAuth($route.name,'update') && !mainData.userid" :data="mainData"  @onSuccess="queryMainData"></createUser>
       </div>
       <div class="container normal-panel" slot="slot0" >
         <baseInfo :mainInfo="mainData"></baseInfo>
@@ -64,7 +64,7 @@ export default {
       this.mainAreaData = [
         {
           label:'电话',
-          value:this.mainData.phonenumber
+          value:this.mainData.accountno !== ''?this.mainData.userphonenumber:this.mainData.phonenumber
         },
         {
           label:'办公电话',

src/HManagement/department/staff/list/modules/add.vue

@@ -100,7 +100,7 @@
       <el-button size="small" type="primary" @click="onSubmit" class="normal-btn-width">确 定</el-button>
     </div>
   </el-drawer>
-  <el-dialog
+<!--  <el-dialog
       title="授权角色"
       :visible.sync="drawer"
       width="564px"
@@ -126,10 +126,10 @@
       </el-row>
     </div>
     <div class="dialog-footer">
-<!--      <el-button size="small" @click="drawer = false" class="normal-btn-width">取 消</el-button>-->
+&lt;!&ndash;      <el-button size="small" @click="drawer = false" class="normal-btn-width">取 消</el-button>&ndash;&gt;
       <el-button size="small" type="warning" @click="createUser" class="normal-btn-width btn-warning">确 定</el-button>
     </div>
-  </el-dialog>
+  </el-dialog>-->
 </div>
 </template>
 
@@ -246,9 +246,14 @@ export default {
             type: 'success'
           });
 
-          this.drawer = true
+          /*this.drawer = true*/
           this.roleForm.hrid = res.data.hrid
-          this.rolelist()
+          /*this.rolelist()*/
+        this.dialogFormVisible = false
+        this.refreshData()
+        this.$emit('onSuccess')
+        this.$store.dispatch('changeDetailDrawer',true)
+        this.$router.push({path:'/depManage/staffDetail',query:{id:res.data.hrid,rowindex:res.data.rowindex}})
 
       });
     },

src/HManagement/department/staff/list/modules/edit.vue

@@ -34,7 +34,8 @@
           </el-col>
           <el-col class="mb-30" :span="12">
             <el-form-item label="手机号码:" prop="phonenumber">
-              <el-input v-model="form.phonenumber" placeholder="输入手机号码" autocomplete="off"></el-input>
+              <el-input v-if="form.accountno === ''" v-model="form.phonenumber" placeholder="输入手机号码" autocomplete="off" ></el-input>
+              <el-input v-else v-model="form.userphonenumber" placeholder="输入手机号码" autocomplete="off" disabled></el-input>
             </el-form-item>
           </el-col>
           <el-col class="mb-30" :span="12">
@@ -167,6 +168,7 @@ export default {
             "hrid":this.$route.query.id
         }
       })
+      console.log(res.data,'编辑数据')
       this.form = Object.assign({},this.form, res.data)
     },
     async department () {

src/SDrpManagement/myaccountclass/index.vue

@@ -15,9 +15,14 @@
               </div>
             </el-col>
           </el-row>
+<!--          <el-input  style="width:200px;" placeholder="搜索" :suffix-icon="param.content.where.condition?param.content.where.condition.length > 0?'':'':'el-icon-search'" v-model="param.content.where.condition" @keyup.native.enter="listData(param.content.pageNumber = 1)" @clear="listData(param.content.pageNumber = 1)" size="small" class="input-with-select inline-16 layout_search__panel" clearable>
+          </el-input>-->
           <tableLayout :layout="tablecols" :data="list" :opwidth="200" :custom="true" :fixedName="'operation'" height="calc(100vh - 390px)">
             <template v-slot:customcol="scope">
-              <p>{{scope.column.data[scope.column.columnname]}}</p>
+              <div v-if="scope.column.columnname === 'type'">
+                {{scope.column.data[scope.column.columnname] === 1?'收入':'支出'}}
+              </div>
+              <p v-else>{{scope.column.data[scope.column.columnname]}}</p>
             </template>
             <template v-slot:opreation="scope">
               <editPrice v-if="tool.checkAuth($route.name,'update')" class="inline-16" :data="scope.data"/>
@@ -61,7 +66,10 @@ export default {
         "content": {
           "pageNumber":1,
           "pageSize":20,
-          "sa_accountclassid":""
+          "sa_accountclassid":"",
+          /*"where": {
+            "condition": ""
+          }*/
         }
       },
       total:0