修改6.21测试问题--系统管理菜单授权，员工管理样式、详情回显籍贯，供应链车型配置样式

3 years ago · 2947a7c6df
4 changed files with 110 additions and 48 deletions
--- a/anrui-management/anrui-management-ui/src/views/sysstaffinfo/yuangongInfo.vue
+++ b/anrui-management/anrui-management-ui/src/views/sysstaffinfo/yuangongInfo.vue
@ -181,7 +181,7 @@
          </el-col>
          <el-col :span="21">
            <el-form-item>
-              <span>{{ temp.province + temp.city + temp.county }}</span>
+              <span>{{ temp.province + temp.city + temp.county + temp.nativePlace}}</span>
            </el-form-item>
          </el-col>
        </el-row>
@ -189,12 +189,14 @@
          <div>更多信息</div>
        </div>
        <el-row>
-          <el-col :span="3">
-            <span><span class="icon">*</span>员工类型</span>
-          </el-col>
          <el-col :span="6">
+            <div class="span-sty">
+              <span><span class="icon">*</span>员工类型</span>
+            </div>
+            <!--          </el-col>-->
+            <!--          <el-col :span="6">-->
            <el-form-item>
-              <span>{{temp.personType}}</span>
+              <span class="addinputw02">{{ temp.personType }}</span>
            </el-form-item>
          </el-col>
          <el-col :span="3">
@ -205,22 +207,24 @@
              <span>{{temp.sysStaffOrg.orgName}}</span>
            </el-form-item>
          </el-col>
-          <el-col :span="2" class="spe_style">
+          <el-col :span="3" class="spe_style">
            <span><span class="icon">*</span>岗位</span>
          </el-col>
-          <el-col :span="4" class="spe_style02">
+          <el-col :span="6" class="spe_style02">
            <el-form-item>
              <span>{{ temp.sysStaffPost.name }}</span>
            </el-form-item>
          </el-col>
        </el-row>
        <el-row>
-          <el-col :span="3">
-            <span><span class="icon">*</span>入职日期</span>
-          </el-col>
          <el-col :span="6">
+            <div class="span-sty">
+              <span><span class="icon">*</span>入职日期</span>
+            </div>
+            <!--          </el-col>-->
+            <!--          <el-col :span="6">-->
            <el-form-item>
-              <span>{{temp.joinCompnyDate}}</span>
+              <span class="addinputw02">{{ temp.joinCompnyDate }}</span>
            </el-form-item>
          </el-col>
          <el-col :span="3">
@ -231,22 +235,24 @@
              <span>{{temp.probPeriod}}</span>
            </el-form-item>
          </el-col>
-          <el-col :span="2" class="spe_style">
+          <el-col :span="3" class="spe_style">
            <span>计划转正日期</span>
          </el-col>
-          <el-col :span="4" class="spe_style02">
+          <el-col :span="6" class="spe_style02">
            <el-form-item>
              <span>{{temp.plannedConfirmDate}}</span>
            </el-form-item>
          </el-col>
        </el-row>
        <el-row>
-          <el-col :span="3">
-            <span>实际转正日期</span>
-          </el-col>
          <el-col :span="6">
+            <div class="span-sty">
+            <span>实际转正日期</span>
+            </div>
+<!--          </el-col>-->
+<!--          <el-col :span="6">-->
            <el-form-item>
-              <span>{{temp.confirmationDate}}</span>
+              <span class="addinputw02">{{temp.confirmationDate}}</span>
            </el-form-item>
          </el-col>
          <el-col :span="3">
@ -257,10 +263,10 @@
              <span>{{temp.openBank}}</span>
            </el-form-item>
          </el-col>
-          <el-col :span="2" class="spe_style">
+          <el-col :span="3" class="spe_style">
            <span>银行账号</span>
          </el-col>
-          <el-col :span="4" class="spe_style02">
+          <el-col :span="6" class="spe_style02">
            <el-form-item>
              <span>{{temp.bankCardNo}}</span>
            </el-form-item>
@ -268,14 +274,14 @@
        </el-row>
        <!-- !!!!各种附件证明图片!!!! -->
        <el-row>
-          <el-col :span="3">
-            <el-form-item>
-              <span>身份证(人像面)</span>
-            </el-form-item>
-          </el-col>
          <el-col :span="6">
+            <div class="span-sty">
+              <span>身份证(人像面)</span>
+            </div>
+<!--          </el-col>-->
+<!--          <el-col :span="6">-->
            <el-form-item>
-              <img v-show="temp.idCardA !=='' ? true : false" style="cursor:pointer;width: 178px;height: 178px;" :src="temp.idCardA" @click="open(temp.idCardA)">
+              <img class="addinputw02" v-show="temp.idCardA !=='' ? true : false" style="cursor:pointer;width: 178px;height: 178px;" :src="temp.idCardA" @click="open(temp.idCardA)">
            </el-form-item>
          </el-col>
          <el-col :span="3">
@ -288,12 +294,12 @@
              <img v-show="temp.idCardB !=='' ? true : false" style="cursor:pointer;width: 178px;height: 178px;" :src="temp.idCardB" @click="open(temp.idCardB)">
            </el-form-item>
          </el-col>
-          <el-col :span="2" class="spe_style">
+          <el-col :span="3" class="spe_style">
            <el-form-item>
-              <span style="font-size: 0.1em;">前公司离职证明</span>
+              <span>前公司离职证明</span>
            </el-form-item>
          </el-col>
-          <el-col :span="4" class="spe_style02">
+          <el-col :span="6" class="spe_style02">
            <el-form-item>
              <img v-show="temp.leaveCertificate !=='' ? true : false" style="cursor:pointer;width: 178px;height: 178px;" :src="temp.leaveCertificate" @click="open(temp.leaveCertificate)">
            </el-form-item>
@ -483,6 +489,27 @@
            </el-form-item>
          </el-col>
        </el-row>
+        <div class="title" style=" display: flex; align-items: center; justify-content: space-between;">
+          <div>合同信息</div>
+        </div>
+        <el-row>
+          <el-col :span="3">
+            <span>合同起止日期</span>
+          </el-col>
+          <el-col :span="9">
+            <el-form-item prop="contractStartDate">
+              <span>{{temp.contractStartDate}}</span>
+            </el-form-item>
+          </el-col>
+          <el-col :span="3">
+            <span>合同结束日期</span>
+          </el-col>
+          <el-col :span="9">
+            <el-form-item prop="contractEndDate">
+              <span>{{temp.contractEndDate}}</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
        <!-- <div v-show="isQuit == true"> -->
        <div v-show="isQuit">
          <div class="title" style=" display: flex; align-items: center; justify-content: space-between;">
@ -544,7 +571,13 @@ export default {
  },
  methods: {
    handleReturn() {
-      this.temp = {}
+      this.temp = {
+        sid: '', // 一条数据的sid
+          sysStaffOrg: {
+          orgName: ''
+        }, // 部门信息
+        sysStaffPost: {} // 岗位信息
+      }
      this.$emit('doback')
    },
    showInfo(sid, row) {
@ -613,4 +646,26 @@ export default {
 .spe_style02 {
  text-align: left;
 }
+
+.span-sty {
+  position: absolute;
+  top: 0;
+  bottom: 0;
+  left: 0;
+  line-height: 50px;
+  text-align: right;
+  font-size: 14px;
+  color: #606266;
+  font-weight: 600;
+  width: 110px;
+  padding-right: 5px;
+  border-right: 1px solid #e0e3eb;
+}
+
+.addinputw02 {
+  padding: 5px 0;
+  width: 60% !important;
+  margin-left: 110px !important;
+  /*line-height: 48px;*/
+}
 </style>
--- a/anrui-management/anrui-management-ui/src/views/sysstaffinfo/yuangongguanli.vue
+++ b/anrui-management/anrui-management-ui/src/views/sysstaffinfo/yuangongguanli.vue
@ -57,16 +57,16 @@
        <el-table v-loading="tableLoading" :data="dataList" border style="width: 100%" @selection-change="handleSelectionChange">
          <el-table-column width="50px" type="selection" align="center"/>
          <el-table-column width="80px" label="序号" type="index" :index="indexMethod" align="center"/>
-          <el-table-column width="110px" prop="jobNumber" label="员工编号" align="center">
+          <el-table-column width="120px" prop="jobNumber" label="员工编号" align="center">
            <template slot-scope="scope">
              <span class="tablerow-click" @click="toInfo(scope.row)">{{ scope.row.jobNumber }}</span>
            </template>
          </el-table-column>
-          <el-table-column width="130px" prop="name" label="员工姓名" align="center"/>
+          <el-table-column width="140px" prop="name" label="员工姓名" align="center"/>
          <el-table-column width="85px" prop="personType" label="员工类型" align="center"/>
-          <el-table-column width="140px" prop="mobile" label="手机号" align="center"/>
-          <el-table-column prop="orgName" label="所在部门" align="left"/>
-          <el-table-column width="180px" prop="postName" label="岗位" align="center"/>
+          <el-table-column width="150px" prop="mobile" label="手机号" align="center"/>
+          <el-table-column prop="orgName" label="所在部门" header-align="center" align="left"/>
+          <el-table-column width="200px" prop="postName" label="岗位" align="center"/>
          <el-table-column width="140px" prop="joinCompnyDate" label="入职日期" align="center"/>
        </el-table>
      </div>
--- a/anrui-scm/anrui-scm-ui/src/views/cheliang/chexingpeizhi/changyongpeizhiAdd.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/cheliang/chexingpeizhi/changyongpeizhiAdd.vue
@ -70,7 +70,7 @@
 <!--          </el-col>-->
 <!--          <el-col :span="2">-->
            <el-form-item prop="specification">
-              <el-select v-model="temp.specification" placeholder="请选择" filterable clearable class="addinputw" @change="changeSpecification">
+              <el-select v-model="temp.specification" placeholder="请选择" filterable clearable class="addinputw addinputw02" @change="changeSpecification">
                <el-option v-for="item in specification_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"/>
              </el-select>
            </el-form-item>
@ -132,7 +132,7 @@
 <!--          </el-col>-->
 <!--          <el-col :span="2">-->
            <el-form-item prop="suspension">
-              <el-select v-model="temp.suspension" placeholder="请选择" filterable clearable class="addinputw" @change="changeSuspension">
+              <el-select v-model="temp.suspension" placeholder="请选择" filterable clearable class="addinputw addinputw02" @change="changeSuspension">
                <el-option v-for="item in suspension_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"/>
              </el-select>
            </el-form-item>
@ -194,7 +194,7 @@
 <!--          </el-col>-->
 <!--          <el-col :span="2">-->
            <el-form-item prop="bumper">
-              <el-select v-model="temp.bumper" placeholder="请选择" filterable clearable class="addinputw" @change="changeBumper">
+              <el-select v-model="temp.bumper" placeholder="请选择" filterable clearable class="addinputw addinputw02" @change="changeBumper">
                <el-option v-for="item in bumper_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"/>
              </el-select>
            </el-form-item>
@ -256,7 +256,7 @@
 <!--          </el-col>-->
 <!--          <el-col :span="2">-->
            <el-form-item prop="packingCase">
-            <el-select v-model="temp.packingCase" placeholder="请选择" filterable clearable class="addinputw" @change="changePackingCase">
+            <el-select v-model="temp.packingCase" placeholder="请选择" filterable clearable class="addinputw addinputw02" @change="changePackingCase">
              <el-option v-for="item in packingCase_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"/>
            </el-select>
              </el-form-item>
@ -1028,8 +1028,10 @@ export default {
 }

 .addinputw {
-  /*width: 75% !important;*/
-  /*display: inline-block;*/
+  width: 60% !important;
+}
+.addinputw02{
+  width: 52% !important;
 }
 </style>

--- a/anrui-system-ui/src/views/RoleAdminister/RoleAdminister.vue
+++ b/anrui-system-ui/src/views/RoleAdminister/RoleAdminister.vue
@ -2,7 +2,6 @@
  <div>
    <el-tabs class="my-tabs" v-model="activeName" type="card" @tab-click="handleClick">
      <el-tab-pane label="角色列表" name="roleList">
-
        <div class="container">
          <div class="tab-header">
            <el-form ref="form" :inline="true" :model="search" label-width="80px">
@ -577,8 +576,14 @@ export default {
    getCheckedKeys() {
      let _this = this
      let roleMenus = []
-      roleMenus = this.$refs.Tree.getCheckedKeys()
-
+      roleMenus = this.$refs.Tree.getCheckedNodes(false, true)
+      // roleMenus = this.$refs.Tree.getCheckedKeys()
+      // console.log('已选节点、半选节点node', roleMenus)
+      const roleMenus_sid = []
+      for (var i = 0; i < roleMenus.length; i++) {
+        roleMenus_sid.push(roleMenus[i].sid)
+      }
+      // console.log('已选节点、半选节点sid',roleMenus_sid)
 //      let parentTrue = this.$refs.Tree.getHalfCheckedKeys()
 //      for (let i = 0; i < parentTrue.length; i++) {
 //        for (let j = 0; j < this.chace.length; j++) {
@ -588,7 +593,7 @@ export default {
 //        }
 //      }
      let params = {
-        menuSid: roleMenus.toString(),
+        menuSid: roleMenus_sid.toString(),
        roleSid: _this.Thisrow.sid
      }
      saveorgrolemenus(params).then(res => {