修改

zhouwx

2025-04-21 c559205d1e496417e09d54b9d824163864a4243d

修改

 src/views/hazardousChemicals/avoidWarning/index.vue

@@ -63,7 +63,7 @@
            </div>
            <div style="margin-top: 10px">相忌试剂：{{ item.tabooBasicName }}</div>
            <div style="margin-top: 10px">存储位置：{{item.warehouseName}}——{{item.cupboardName}}</div>
            <el-button style="margin-top: 15px;float: right;color: white;margin-bottom: 5px" :color="item.warningType == 1 ? '#ef8a8a' : '#efb965'" @click="handle(item)">立即处理</el-button>
<!--            <el-button style="margin-top: 15px;float: right;color: white;margin-bottom: 5px" :color="item.warningType == 1 ? '#ef8a8a' : '#efb965'" @click="handle(item)">立即处理</el-button>-->

          </el-card>
        </el-col>

 src/views/hazardousChemicals/overdueWarning/index.vue

@@ -65,12 +65,12 @@
          <span>{{scope.row.state === 0 ? '未处理':'已处理'}}</span>
        </template>
      </el-table-column>
      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="200" >
        <template #default="scope">
          <el-button link type="primary" v-if="scope.row.state === 0" @click="markWarn(scope.row)">标记处理</el-button>
          <el-button link type="danger" @click="handleDelete(scope.row)">删除</el-button>
        </template>
      </el-table-column>
<!--      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="200" >-->
<!--        <template #default="scope">-->
<!--          <el-button link type="primary" v-if="scope.row.state === 0" @click="markWarn(scope.row)">标记处理</el-button>-->
<!--          <el-button link type="danger" @click="handleDelete(scope.row)">删除</el-button>-->
<!--        </template>-->
<!--      </el-table-column>-->
    </el-table>

    <pagination

 src/views/hazardousChemicals/systemManage/user/components/userDialog.vue

@@ -34,10 +34,11 @@
        <el-form-item label="用户类型:" v-if="state.title !== '修改密码'" prop="userType" >
          <el-radio-group v-model="state.form.userType" @change="changeType" v-if="state.title == '新增用户'" >
            <el-radio :label="0" v-if="state.isAdmin">管理员</el-radio>
            <el-radio :label="3" v-if="state.isAdmin">监管用户</el-radio>
            <el-radio :label="1" v-if="state.isAdmin">企业用户</el-radio>
            <el-radio :label="2" v-if="!state.isAdmin">普通用户</el-radio>
          </el-radio-group>
          <span v-else>{{state.form.userType ==0 ? '管理员':state.form.userType ==1 ? '企业用户' : '普通用户'}}</span>
          <span v-else>{{state.form.userType ==0 ? '管理员':state.form.userType ==1 ? '企业用户' : state.form.userType ==2 ?'普通用户':'监管用户'}}</span>
        </el-form-item>
        <el-form-item label="所属企业:" prop="companyName" v-if="state.title !== '修改密码' && state.form.userType !=0 &&  state.form.userType !=3">
          <el-select
@@ -218,17 +219,16 @@
const userInfo = ref()
const classifyRef = ref(null)
const openDialog = async (type, value) => {

  userInfo.value = JSON.parse(Cookies.get('userInfo'))
  console.log("userInfo",userInfo.value)
  state.currentUserType = userInfo.value.userType
  state.form.userType = userInfo.value.userType
  if(userInfo.value.userType === 0){
    state.isAdmin = true;
  }else {
    state.isAdmin = false;
    state.form.companyId = userInfo.value.companyId;
    state.form.companyName = userInfo.value.companyName;
    state.form.userType = 2
    // state.form.userType = 2
  }

  state.title = type === 'add' ? '新增用户' : type ==='edit' ? '编辑用户' : type ==='pwd' ? '修改密码' : '查看用户' ;