Merge remote-tracking branch 'origin/master'

zzw

2023-11-14 33880145617845479c6e3ba9d069eb9935d8d2ce

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

@@ -76,7 +76,7 @@
                </el-form-item>
                <!-- 联系人 -->
                <el-form-item class="marginTopAndMarginBottom" label="软件标识" style="width: 49%">
                  <el-input readonly v-model="dataForm.project.identity" placeholder="请输入软件标识"></el-input>
                  <el-input readonly v-model="dataForm.project.softwareIdentity" placeholder="请输入软件标识"></el-input>
                </el-form-item>
                <!-- 详细地址 -->
                <el-form-item label="密级" style="width: 49%">
@@ -392,18 +392,7 @@
                    <span>{{ dataForm.write }}</span>
                  </div>
                  <div class="el-flex">
                    <div style="width: 60px;text-align: center">
                      {{ getYearMonDay(dataForm.softwareTestOrder.startDate).year }}
                    </div>
                    年
                    <div style="width: 40px;text-align: center">
                      {{ getYearMonDay(dataForm.softwareTestOrder.startDate).month }}
                    </div>
                    月
                    <div style="width: 40px;text-align: center">
                      {{ getYearMonDay(dataForm.softwareTestOrder.startDate).day }}
                    </div>
                    日
                    {{ dataForm.softwareTestOrder.deliveryDate | filterTime('YYYY年MM月DD日') }}
                  </div>
                </div>
              </div>
@@ -460,7 +449,7 @@
          entrustUnitContWay: '',
          entrustUnitContact: '',
          entrustUnitName: '',
          identity: '',
          softwareIdentity: '',
          isContract: '',
          projectLeader: '',
          projectReviewer: '',
@@ -500,6 +489,12 @@
      })
      console.log(this.editingCell, 'this.editingCell')
    },

    init2(data){
      this.dataForm.id = null
      this.dataForm.projectId = data.id
      this.getInfo()
    },
    // 获取信息
    async getInfo() {
      let params = {
@@ -512,9 +507,9 @@
          ...res.data
        }
      }

      console.log(this.dataForm, "this.dataForm")
    },

    // 表单提交
    async formSubmit() {
      console.log(this.dataForm, ' this.dataForm')