项目表

wente

2023-11-16 b341867731286e7ebfa1bc5fd8f699c780d232a4

项目表

 web/packages/components/zt-dict-tag/src/zt-dict-tag.vue

@@ -32,7 +32,8 @@
    data() {
      return {
        tagType: 'primary',
        tagColor: ''
        tagColor: '',
        colorArr:['primary','success','info','warning','danger']
      }
    },
    mounted() {
@@ -41,6 +42,7 @@
    methods: {
      async init() {
        let value = this.value + ''

        if (this.typeS && this.typeS.split(',').indexOf(value) >= 0) {
          this.tagType = 'success'
        }
@@ -58,7 +60,9 @@
        }
        if (!this.typeS && !this.typeI && !this.typeW && !this.typeD && !this.typeColor) { // 没有指定颜色
          if (this.value === false || this.value === 0 || this.value === '0' || this.value === 'false') {
            this.tagType = 'info'
            this.tagType = 'primary'
          }else{
            this.tagType = this.colorArr[this.value%5]
          }
        }
      }

 web/src/views/modules/project/Project-AddOrUpdate.vue

@@ -97,15 +97,25 @@
            <div class="DSTOld-1-Form">
              <!-- 项目负责人 -->
              <zt-form-item class="marginTopAndMarginBottom" label-width="120px" label="项目负责人" prop="projectLeader" style="width: 48%" rules="required">
                <el-input v-model="dataForm.projectLeader" placeholder="请输入项目负责人"></el-input>
                <zt-select v-model="dataForm.projectLeader" url="/sys/userEx/getUsersList" placeholder="项目负责人"/>
<!--                <el-input v-model="dataForm.projectLeader" placeholder="请输入项目负责人"></el-input>-->
<!--                <el-select  v-model="dataForm.projectLeader"   placeholder="项目负责人" style="width: 100%">-->
<!--                  <el-option v-for="data in dataList"></el-option>-->
<!--                </el-select>-->
<!--                <el-select v-model="dataForm.projectLeader" clearable placeholder="项目负责人">-->
<!--                  <el-option v-for="item in dataList" :key="item.value" :label="item.label"-->
<!--                             :value="item.value"/>-->
<!--                </el-select>-->
              </zt-form-item>
              <!-- 项目测试人员 -->
              <zt-form-item class="marginTopAndMarginBottom" label-width="120px" label="项目测试人员" prop="projectTesters" style="width: 48%" rules="required">
                <el-input v-model="dataForm.projectTesters" placeholder="请输入项目测试人员"></el-input>
<!--                <el-input v-model="dataForm.projectTesters" placeholder="请输入项目测试人员"></el-input>-->
                <zt-select v-model="dataForm.projectTesters" url="/sys/userEx/getUsersList" :multiple="true" :clearable="true" placeholder="项目测试人员"/>
              </zt-form-item>
              <!-- 项目审核人 -->
              <zt-form-item label-width="120px" label="项目审核人" prop="projectReviewer" style="width: 48%" rules="required">
                <el-input v-model="dataForm.projectReviewer" placeholder="请输入项目审核人"></el-input>
<!--                <el-input v-model="dataForm.projectReviewer" placeholder="请输入项目审核人"></el-input>-->
                <zt-select v-model="dataForm.projectReviewer" url="/sys/userEx/getUsersList" :multiple="true" :clearable="true" placeholder="项目审核人"/>
              </zt-form-item>
              <!-- 是否签署合同 -->
              <zt-form-item label-width="120px" label="是否签署合同" prop="isContract" style="width: 48%" rules="required">
@@ -156,15 +166,40 @@
            ...res.data
          }
        }
        if(this.dataForm && this.dataForm.projectTesters){
            this.dataForm.projectTesters=this.dataForm.projectTesters.split(',')
            console.log(this.dataForm.projectTesters)
          }
          if(this.dataForm && this.dataForm.projectReviewer){
            this.dataForm.projectReviewer=this.dataForm.projectReviewer.split(',')
            console.log(this.dataForm.projectReviewer)
          }
        console.log(this.dataForm,'this.dataForm')
      },
      // 表单提交
      async formSubmit() {
        if(this.dataForm && this.dataForm.projectTesters){
          this.dataForm.projectTesters=this.dataForm.projectTesters.join(',')
          console.log(this.dataForm.projectTesters)
        }
        if(this.dataForm && this.dataForm.projectReviewer){
          this.dataForm.projectReviewer=this.dataForm.projectReviewer.join(',')
          console.log(this.dataForm.projectReviewer)
        }
        let res = await this.$http[!this.dataForm.id ? 'post' : 'put']('/project/Project//', this.dataForm)
        if (res.success) {
          await this.$tip.success()
          this.$refs.dialog.close()
          this.$emit('refreshDataList')
        }else {
          if(this.dataForm && this.dataForm.projectTesters){
            this.dataForm.projectTesters=this.dataForm.projectTesters.split(',')
            console.log(this.dataForm.projectTesters)
          }
          if(this.dataForm && this.dataForm.projectReviewer){
            this.dataForm.projectReviewer=this.dataForm.projectReviewer.split(',')
            console.log(this.dataForm.projectReviewer)
          }
        }
      }
    }

 web/src/views/modules/project/SoftwareTestOrder-AddOrUpdate.vue

@@ -1,9 +1,9 @@
<template>
  <zt-dialog ref="dialog" column="2" @confirm="formSubmit">
    <el-form ref="form" :inline="true" :model="dataForm" :disabled="dataForm.disabled" label-width="120px"
             class="weiTuoDanAuto">
             class="weiTuoDanAuto" style="padding-top: 0">
      <div class="DManageForm">
        <el-form-item readonly label-width="60px" label="编号:" style="width: 99% ;margin-bottom:-5px">
        <el-form-item readonly label-width="50px" label="编号:" style="width: 99% ;margin-bottom:-5px">
          <span>{{ dataForm.softwareTestOrder.code}}</span>
        </el-form-item>
      </div>
@@ -157,7 +157,7 @@
                  <div class="DWidth DAlign DHold">
                    测试类型
                  </div>
                  <div class="el-border-left" style="width: 98%">
                  <div class="el-border-left test-type-line-height" style="width: 98%">
                    <el-form-item  style="width: 40%;padding-left:5%;margin-bottom: 0">
                      <zt-dict-checkbox v-model="dataForm.softwareTestOrder.testType1" column="2" dict="test_type1"
                                        clearable></zt-dict-checkbox>
@@ -487,9 +487,14 @@
          ...res.data
        }
        if(this.dataForm.softwareTestOrder){
          this.dataForm.softwareTestOrder.testType1=this.dataForm.softwareTestOrder.testType1.split(',')
          this.dataForm.softwareTestOrder.testType2=this.dataForm.softwareTestOrder.testType2.split(',')
          console.log(this.dataForm.softwareTestOrder.testType1)
          if(this.dataForm.softwareTestOrder.testType1){
            this.dataForm.softwareTestOrder.testType1=this.dataForm.softwareTestOrder.testType1.split(',')
            console.log(this.dataForm.softwareTestOrder.testType1)
          }
          if(this.dataForm.softwareTestOrder.testType2){
            this.dataForm.softwareTestOrder.testType2=this.dataForm.softwareTestOrder.testType2.split(',')
            console.log(this.dataForm.softwareTestOrder.testType2)
          }
        }
        if(this.dataForm.project === null){
          this.dataForm.project={}
@@ -514,8 +519,12 @@
    // 表单提交
    async formSubmit() {
      console.log(this.dataForm, ' this.dataForm')
      this.dataForm.softwareTestOrder.testType1=this.dataForm.softwareTestOrder.testType1.join(',')
      this.dataForm.softwareTestOrder.testType2=this.dataForm.softwareTestOrder.testType2.join(',')
      if(this.dataForm.softwareTestOrder.testType1){
        this.dataForm.softwareTestOrder.testType1=this.dataForm.softwareTestOrder.testType1.join(',')
      }
      if(this.dataForm.softwareTestOrder.testType2){
        this.dataForm.softwareTestOrder.testType2=this.dataForm.softwareTestOrder.testType2.join(',')
      }
      console.log(this.dataForm.softwareTestOrder.testType1)
      let res = await this.$http[!this.dataForm.id ? 'post' : 'put']('/project/SoftwareTestOrder/', this.dataForm)
      if (res.success) {
@@ -523,8 +532,12 @@
        this.$refs.dialog.close()
        this.$emit('refreshDataList')
      }else{
        this.dataForm.softwareTestOrder.testType1=this.dataForm.softwareTestOrder.testType1.split(',')
        this.dataForm.softwareTestOrder.testType2=this.dataForm.softwareTestOrder.testType2.split(',')
        if(this.dataForm.softwareTestOrder.testType1){
          this.dataForm.softwareTestOrder.testType1=this.dataForm.softwareTestOrder.testType1.split(',')
        }
        if(this.dataForm.softwareTestOrder.testType2){
          this.dataForm.softwareTestOrder.testType2=this.dataForm.softwareTestOrder.testType2.split(',')
        }
      }
    }
  }
@@ -627,4 +640,7 @@
.csjgxx > .el-form-item > .el-form-item__content {
  width: calc(100% - 130px);
}
.test-type-line-height>.el-form-item>.el-form-item__content{
  line-height: 30px;
}
</style>

 zt/common/src/main/java/com/zt/core/sys/model/SysUser.java

@@ -43,6 +43,9 @@
@TableName("SYS_USER")
public class SysUser extends BusiEntity {
    private static final long serialVersionUID = 1L;
    @TableField(exist = false)
    @ApiModelProperty(value = "用户名", required = false)
    private  String name;
    @ApiModelProperty(value = "用户ID", required = false)
    private  Long userId;
    @ApiModelProperty(value = "员工工号", required = false)

 zt/core/src/main/resources/mapper/sys/SysUserDao.xml

@@ -243,7 +243,7 @@
            )
    </select>
    <select id="getUsersList" resultType="com.zt.core.sys.model.SysUser">
        select nick_name,user_id from sys_user
        select nick_name as name,user_id as id from sys_user
    </select>

    <update id="updatePassword">