Merge remote-tracking branch 'origin/master'

k94314517

2024-10-16 d32227561023d5347141678102e55f6ca5add619

Merge remote-tracking branch 'origin/master'

 admin/src/components/business/OperaMemberWindow.vue

@@ -41,7 +41,7 @@
        </el-date-picker>
      </el-form-item>
        <el-form-item label="是否党员" prop="isDangyuan">
          <el-radio-group v-model="form.radio" @input="isDangyuan">
          <el-radio-group v-model="form.isDangyuan" >
            <el-radio :label="0">非党员</el-radio>
            <el-radio :label="1">党员</el-radio>
          </el-radio-group>
@@ -137,7 +137,7 @@
      this.department = depart
      this.visible = true
      this.companyType = companyType
      this.positionList()
      this.getPositionList()
      // 新建
      if (target == null) {
        this.$nextTick(() => {

 admin/src/views/business/internalMember.vue

@@ -93,11 +93,11 @@
          </template>
        </el-table-column>
        <el-table-column prop="companyName" label="所属部门" min-width="100px"></el-table-column>
        <el-table-column prop="postionName" label="岗位" min-width="100px"></el-table-column>
        <el-table-column prop="positionName" label="岗位" min-width="100px"></el-table-column>
        <el-table-column prop="isDangyuan" label="是否党员" min-width="100px">
          <template slot-scope="{row}">
          <span v-if="row.isDangyuan == 0" style="color: green">是</span>
          <span v-else >否</span>
          <span v-if="row.isDangyuan ==1 " style="color: green">党员</span>
          <span v-else >非党员</span>
          </template>
        </el-table-column>
        <el-table-column prop="jobDate" label="入职日期" min-width="100px"></el-table-column>

 admin/src/views/business/relativeMember.vue

@@ -98,11 +98,11 @@
          </template>
        </el-table-column>
        <el-table-column prop="companyName" label="所属部门" min-width="100px"></el-table-column>
        <el-table-column prop="postionName" label="岗位" min-width="100px"></el-table-column>
        <el-table-column prop="positionName" label="岗位" min-width="100px"></el-table-column>
        <el-table-column prop="isDangyuan" label="是否党员" min-width="100px">
          <template slot-scope="{row}">
            <span v-if="row.statusisDangyuan == 0" style="color: green">是</span>
            <span v-else >否</span>
            <span v-if="row.isDangyuan ==1 " style="color: green">党员</span>
            <span v-else >非党员</span>
          </template>
        </el-table-column>
        <el-table-column prop="jobDate" label="入职日期" min-width="100px">  </el-table-column>
@@ -186,8 +186,8 @@
              v-permissions="['business:member:head']">取消主管</el-button>
            <el-button type="text" :loading="heading" icon="el-icon-edit" @click="updateHead(row, 1)"
              v-if="row.headStatus == 0" v-permissions="['business:member:head']">设为主管</el-button>
            <el-button type="text" icon="el-icon-delete" style="color: red" @click="empower(row.id)"
              v-permissions="['business:empower:delete']">删除</el-button>
            <el-button type="text" icon="el-icon-delete" @click="deleteById(row)" style="color: red"
                       v-permissions="['business:member:delete']">删除</el-button>
          </template>
        </el-table-column>
      </el-table>
@@ -244,7 +244,8 @@
      working: false,
      canvisiting: false,
      companyTree: [],
      department: []
      department: [],
      positionList: [],
    }
  },
  created () {

 admin/src/views/index.vue

@@ -479,7 +479,7 @@
          formatter: function (params) {
            return `
          <div style="background-color: #15323f;margin: -12px;padding: 14px;border: 2px solid rgba(1,217,254,0.5);color: #fff;">
            <div>${params[0].name}日客流</div>
            <div>${params[0].name}</div>
            <div style="display: flex;align-items: center;">
              <div style="width: 10px;height: 10px;border-radius: 50%;background-color: #6feef0;"></div>
              <span style="margin-left: 6px;">${params[0].value}</span>
@@ -579,11 +579,11 @@
          formatter: function (params) {
            return `
          <div style="background-color: #15323f;margin: -12px;padding: 14px;border: 2px solid rgba(1,217,254,0.5);color: #fff;">
            <div>${params[0].name}日客流</div>
            <div>${params[0].name}</div>
            <div style="display: flex;align-items: center;">
              <div style="width: 10px;height: 10px;border-radius: 50%;background-color: #6feef0;"></div>
              <span style="margin-left: 6px;">${params[0].value}</span>
              <div>人</div>
              <div>辆</div>
            </div>
          </div>
        `

 admin/src/views/platform/components/WaybillDetail.vue

@@ -29,13 +29,14 @@
        <div class="item" v-for="item in info.wmsJobContractVOList">
          <div class="contract">
            <span>合同号：{{ item.contractCode }}</span>
            <div>
            <!-- <div> -->
              <span class="scs" v-if="item.status == 1">WMS作业已完成</span>
              <span class="pad" v-if="item.status == 0">WMS作业未完成</span>
              <span class="err" v-if="item.status == 2">WMS作业已取消</span>

              <span class="scs" v-if="item.lockStatus == 1">电子锁已上锁</span>
              <span class="pad" v-if="item.lockStatus == 0">电子锁未上锁</span>
            </div>
            <!-- </div> -->
          </div>
          <div class="placeholder6">收货地：{{ item.address }}</div>
          <div class="list">

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceRoleServiceImpl.java

@@ -50,7 +50,6 @@
    private MemberCardMapper memberCardMapper;
    @Autowired
    private EmpowerMapper empowerMapper;

    @Autowired
    private DeviceMapper deviceMapper;
    @Autowired

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java

@@ -909,6 +909,10 @@
                    .set(updateMember.getFaceId()!=null,Member::getFaceId,updateMember.getFaceId())
                    .set(updateMember.getCompanyId()!=null,Member::getCompanyId,updateMember.getCompanyId())
                    .set(StringUtils.isNotBlank(updateMember.getCode()),Member::getCode,updateMember.getCode())
                    .set( updateMember.getPositionId()!=null,Member::getPositionId,updateMember.getPositionId())
                    .set( updateMember.getIsDangyuan()!=null,Member::getIsDangyuan,updateMember.getIsDangyuan())
                    .set( updateMember.getJobDate()!=null,Member::getJobDate,updateMember.getJobDate())
                    .set(StringUtils.isNotBlank(updateMember.getCode()),Member::getCode,updateMember.getCode())
                    .eq(Member::getId,updateMember.getId()));
            dealTrainTIme(updateMember,1,loginUserInfo);
            cancelAllMemberEmpower(updateMember,memberRoleMapper,empowerMapper);