Changes

jinlin

2023-11-10 cb573b4eee7426d0d614fd59f48c1e8575738b8e

Changes

 modules/mainPart/src/main/java/com/zt/life/modules/project/controller/SoftwareTestOrderController.java

@@ -66,22 +66,22 @@
        return PageResult.ok(softwareTestOrderService.page(queryFilter));
    }

    @GetMapping("{id}")
    @GetMapping("getDto")
    @ApiOperation("信息")
    public Result<SoftwareTestOrderDto> get(@PathVariable("id") Long id, @PathVariable("projectId") Long projectId) {
    public Result<SoftwareTestOrderDto> getDto(Long orderId, Long projectId) {
        SoftwareTestOrderDto data = new SoftwareTestOrderDto();

        if (id != null) {
            data.setId(id);
            SoftwareTestOrder softwareTestOrder = softwareTestOrderService.get(id);
        if (orderId != null) {
            data.setId(orderId);
            SoftwareTestOrder softwareTestOrder = softwareTestOrderService.get(orderId);
            data.setSoftwareTestOrder(softwareTestOrder);

            if (projectId == null)
                projectId = softwareTestOrder.getProjectId();

            data.setTestAgencyInfo(testAgencyInfoService.get(id));
            data.setSoftwareTestOrderDeliverableList(softwareTestOrderDeliverableService.childrenTables(id));
            data.setSoftwareTestOrderMeasuredList(softwareTestOrderMeasuredService.childrenTables(id));
            data.setTestAgencyInfo(testAgencyInfoService.get(orderId));
            data.setSoftwareTestOrderDeliverableList(softwareTestOrderDeliverableService.childrenTables(orderId));
            data.setSoftwareTestOrderMeasuredList(softwareTestOrderMeasuredService.childrenTables(orderId));
        } else {
            data.setTestAgencyInfo(testAgencyInfoService.get(10000L));
        }

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

@@ -2,71 +2,71 @@
  <zt-dialog ref="dialog" column="2" @confirm="formSubmit">
    <el-form :model="dataForm" ref="dataForm" :disabled="dataForm.disabled" label-width="120px">
      <zt-form-item label="运行环境" prop="optEnviron" rules="required">
                        <el-input v-model="dataForm.optEnviron"></el-input>
                </zt-form-item>
        <el-input v-model="dataForm.optEnviron"></el-input>
      </zt-form-item>
      <zt-form-item label="编程语言" prop="programLang" rules="required">
                        <el-input v-model="dataForm.programLang"></el-input>
                </zt-form-item>
        <el-input v-model="dataForm.programLang"></el-input>
      </zt-form-item>
      <zt-form-item label="测试依据" prop="testBasis" rules="required">
                        <zt-dict v-model="dataForm.testBasis" dict="test_basis"></zt-dict>
                </zt-form-item>
        <zt-dict v-model="dataForm.testBasis" dict="test_basis"></zt-dict>
      </zt-form-item>
      <zt-form-item label="测试类型" prop="testType" rules="required">
                        <zt-dict v-model="dataForm.testType" dict="test_type1"></zt-dict>
                </zt-form-item>
        <zt-dict v-model="dataForm.testType" dict="test_type1"></zt-dict>
      </zt-form-item>
      <zt-form-item label="测试标准" prop="testStandard" rules="required">
                        <zt-dict v-model="dataForm.testStandard" dict="test_standard"></zt-dict>
                </zt-form-item>
        <zt-dict v-model="dataForm.testStandard" dict="test_standard"></zt-dict>
      </zt-form-item>
      <zt-form-item label="开始日期" prop="startDate" rules="required">
                        <el-input v-model="dataForm.startDate"></el-input>
                </zt-form-item>
        <el-input v-model="dataForm.startDate"></el-input>
      </zt-form-item>
      <zt-form-item label="结束日期" prop="endDate" rules="required">
                        <el-input v-model="dataForm.endDate"></el-input>
                </zt-form-item>
        <el-input v-model="dataForm.endDate"></el-input>
      </zt-form-item>
      <zt-form-item label="测试场地" prop="testVenue" rules="required">
                        <el-input v-model="dataForm.testVenue"></el-input>
                </zt-form-item>
        <el-input v-model="dataForm.testVenue"></el-input>
      </zt-form-item>
      <zt-form-item label="其他要求" prop="otherRequire" rules="required">
                        <el-input v-model="dataForm.otherRequire"></el-input>
                </zt-form-item>
        <el-input v-model="dataForm.otherRequire"></el-input>
      </zt-form-item>
      <zt-form-item label="测试日期" prop="testDate" rules="required">
                        <el-input v-model="dataForm.testDate"></el-input>
                </zt-form-item>
        <el-input v-model="dataForm.testDate"></el-input>
      </zt-form-item>
      <zt-form-item label="交付日期" prop="deliveryDate" rules="required">
                        <el-input v-model="dataForm.deliveryDate"></el-input>
                </zt-form-item>
        <el-input v-model="dataForm.deliveryDate"></el-input>
      </zt-form-item>
      <zt-form-item label="检测费用" prop="testCost" rules="required">
                        <el-input v-model="dataForm.testCost"></el-input>
                </zt-form-item>
        <el-input v-model="dataForm.testCost"></el-input>
      </zt-form-item>
      <zt-form-item label="物品性质" prop="articleNature" rules="required">
                        <zt-dict v-model="dataForm.articleNature" dict="article_nature"></zt-dict>
                </zt-form-item>
        <zt-dict v-model="dataForm.articleNature" dict="article_nature"></zt-dict>
      </zt-form-item>
      <zt-form-item label="样品状态" prop="sampleStatus" rules="required">
                        <el-input v-model="dataForm.sampleStatus"></el-input>
                </zt-form-item>
        <el-input v-model="dataForm.sampleStatus"></el-input>
      </zt-form-item>
      <zt-form-item label="测评机构名称" prop="agencyName" rules="required">
                        <el-input v-model="dataForm.agencyName"></el-input>
                </zt-form-item>
        <el-input v-model="dataForm.agencyName"></el-input>
      </zt-form-item>
      <zt-form-item label="地址" prop="site" rules="required">
                        <el-input v-model="dataForm.site"></el-input>
                </zt-form-item>
        <el-input v-model="dataForm.site"></el-input>
      </zt-form-item>
      <zt-form-item label="业务联系" prop="businContact" rules="required">
                        <el-input v-model="dataForm.businContact"></el-input>
                </zt-form-item>
        <el-input v-model="dataForm.businContact"></el-input>
      </zt-form-item>
      <zt-form-item label="业务投诉" prop="businComplaint" rules="required">
                        <el-input v-model="dataForm.businComplaint"></el-input>
                </zt-form-item>
        <el-input v-model="dataForm.businComplaint"></el-input>
      </zt-form-item>
      <zt-form-item label="实验室联系人" prop="laborContact" rules="required">
                        <el-input v-model="dataForm.laborContact"></el-input>
                </zt-form-item>
        <el-input v-model="dataForm.laborContact"></el-input>
      </zt-form-item>
      <zt-form-item label="实验室联系电话" prop="labContactNum" rules="required">
                        <el-input v-model="dataForm.labContactNum"></el-input>
                </zt-form-item>
        <el-input v-model="dataForm.labContactNum"></el-input>
      </zt-form-item>
      <zt-form-item label="邮政编码" prop="postalCode" rules="required">
                        <el-input v-model="dataForm.postalCode"></el-input>
                </zt-form-item>
        <el-input v-model="dataForm.postalCode"></el-input>
      </zt-form-item>
      <zt-form-item label="传真" prop="fax" rules="required">
                        <el-input v-model="dataForm.fax"></el-input>
                </zt-form-item>
        <el-input v-model="dataForm.fax"></el-input>
      </zt-form-item>
    </el-form>
  </zt-dialog>
</template>
@@ -76,20 +76,24 @@
    data() {
      return {
        dataForm: {
          id: '',
          projectId: ''
          id: null,
          projectId: null
        }
      }
    },
    methods: {
      // 获取信息
      async getInfo() {
        let res = await this.$http.get(`/project/SoftwareTestOrder/${this.dataForm.id}`)
        let params = {
          orderId: this.dataForm.id,
          projectId: this.dataForm.projectId
        }
        let res = await this.$http.get(`/project/SoftwareTestOrder/getDto`, {params: params})
        this.dataForm = {
          ...this.dataForm,
          ...res.data
        }
        console.log(this.dataForm,"this.dataForm")
        console.log(this.dataForm, "this.dataForm")
      },
      // 表单提交
      async formSubmit() {