Merge remote-tracking branch 'origin/master'

zzw

2023-11-14 33880145617845479c6e3ba9d069eb9935d8d2ce

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

@@ -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: '',
@@ -501,7 +490,7 @@
      console.log(this.editingCell, 'this.editingCell')
    },

    init(data){
    init2(data){
      this.dataForm.id = null
      this.dataForm.projectId = data.id
      this.getInfo()