feat(order): 添加订单委托要求字段并优化界面流程 - 新增分包内容、样品处置、结果评价、报告交付方式等委托要求字段 - 添加分包单位信息、...

liding

2026-09-23 ce2570f8555ff6668da4f149521b4620bdd9d8bf

 src/views/business/productOrder/components/addOrder.vue

@@ -147,9 +147,67 @@
            </el-col>
          </el-row>
          <el-row :gutter="16">
            <el-col :span="6">
              <el-form-item label="分包内容">
                <el-radio-group v-model="addObj.subcontractType" :disabled="active>1" size="mini">
                  <el-radio :label="1" border style="margin-right: 0">有</el-radio>
                  <el-radio :label="0" border>无</el-radio>
                </el-radio-group>
              </el-form-item>
            </el-col>
            <el-col :span="6">
              <el-form-item label="样品处置">
                <el-radio-group v-model="addObj.sampleDisposal" :disabled="active>1" size="mini">
                  <el-radio :label="1" border style="margin-right: 0">委托方取回</el-radio>
                  <el-radio :label="2" border>检测方处置</el-radio>
                </el-radio-group>
              </el-form-item>
            </el-col>
            <el-col :span="6">
              <el-form-item label="对结果评价">
                <el-radio-group v-model="addObj.resultEvaluation" :disabled="active>1" size="mini">
                  <el-radio :label="1" border style="margin-right: 0">是</el-radio>
                  <el-radio :label="0" border>否</el-radio>
                </el-radio-group>
              </el-form-item>
            </el-col>
            <el-col :span="6">
              <el-form-item label="报告交付方式">
                <el-radio-group v-model="addObj.reportDelivery" :disabled="active>1" size="mini">
                  <el-radio :label="1" border style="margin-right: 0">自取</el-radio>
                  <el-radio :label="2" border>快递</el-radio>
                  <el-radio :label="3" border>电子传送</el-radio>
                </el-radio-group>
              </el-form-item>
            </el-col>
          </el-row>
          <el-row v-if="addObj.subcontractType === 1" :gutter="16">
            <el-col :span="12">
              <el-form-item label="分包单位信息">
                <el-input v-model="addObj.subcontractCompany" :disabled="active>1" size="small"
                          placeholder="请填写分包单位信息"/>
              </el-form-item>
            </el-col>
          </el-row>
          <el-row v-if="addObj.reportDelivery === 2" :gutter="16">
            <el-col :span="12">
              <el-form-item label="报告寄送地址">
                <el-input v-model="addObj.reportAddress" :disabled="active>1" size="small"
                          placeholder="请填写报告寄送地址"/>
              </el-form-item>
            </el-col>
            <el-col :span="12">
              <el-form-item label="收件人及电话">
                <el-input v-model="addObj.reportReceiver" :disabled="active>1" size="small"
                          placeholder="请填写收件人及电话"/>
              </el-form-item>
            </el-col>
          </el-row>
          <el-row :gutter="16">
            <el-col :span="24">
              <el-form-item label="备注">
                <el-input v-model="addObj.remark" :disabled="active>1" size="small"/>
                <el-input v-model="addObj.remark" :disabled="active>1" size="small"
                          placeholder="可选，补充说明委托事项"/>
              </el-form-item>
            </el-col>
          </el-row>
@@ -768,7 +826,6 @@
import {
  addInsOrder, addInsOrderTemplate, delInsOrderTemplate,
  getQuarterOnOrder, judgeNotSpotCheckOrder, selectInsOrderTemplateById,
  selectOrderManDay,
  updateInsOrder,
  upInsOrder,
  upInsOrderOfState
@@ -855,6 +912,13 @@
        sampleViewEn: '', // 样品名称英文（报告展示字段）
        productionDate: null,
        sampleDate: null,
        subcontractType: 0,
        subcontractCompany: '',
        sampleDisposal: 1,
        resultEvaluation: 0,
        reportDelivery: 1,
        reportAddress: '',
        reportReceiver: '',
      },
      addObjRules: { // 表单校验规则
        orderType: [
@@ -1348,6 +1412,19 @@
          this.$message.error('请填写检测依据、委托单位、检验类别和样品数量');
          return;
        }
        if (this.addObj.subcontractType == null || this.addObj.sampleDisposal == null
          || this.addObj.resultEvaluation == null || this.addObj.reportDelivery == null) {
          this.$message.error('请选择分包内容、样品处置、对结果评价和报告交付方式');
          return;
        }
        if (this.addObj.subcontractType === 1 && !this.addObj.subcontractCompany) {
          this.$message.error('分包内容为有时，请填写分包单位信息');
          return;
        }
        if (this.addObj.reportDelivery === 2 && (!this.addObj.reportAddress || !this.addObj.reportReceiver)) {
          this.$message.error('报告交付方式为快递时，请填写报告寄送地址和收件人及电话');
          return;
        }
        this.saveData([]);
        return;
      }
@@ -1619,17 +1696,10 @@
          company: this.addObj.company
        }).then(res => {
          this.saveLoad = false
          this.$message.success('提交成功')
          selectOrderManDay({
            id: this.currentId
          }).then(ress => {
            this.distributeData.orderId = this.currentId
            this.distributeData.appointed = ress.data
          })
          setTimeout(() => {
            this.distributeData.sonLaboratory = this.newJuLaboratoryList.length > 0 ? this.newJuLaboratoryList[0].value : ''
            this.issuedDialogVisible = true;
          }, 1000)
          this.$message.success('审核通过')
          this.closeOpenPage()
        }).catch(() => {
          this.saveLoad = false
        })
      } else {
        // 不通过
@@ -1973,6 +2043,7 @@
        this.templateLoading = true;
        addInsOrderTemplate({
          name: this.templateName,
          standardTreeId: this.addObj.standardTreeId || null,
          thing: JSON.stringify({
            addObj: this.addObj,
            sampleList: this.sampleList,
@@ -1994,7 +2065,8 @@
    // 查询模板
    selectInsOrderTemplateById(e) {
      selectInsOrderTemplateById({id: e}).then(res => {
        let obj = JSON.parse(res.data)
        const detail = res.data || {}
        let obj = JSON.parse(detail.thing)
        //制单人设置为当前登录用户
        let user = this.nickName
        obj.addObj.custom = user.name
@@ -2002,6 +2074,11 @@
        this.addObj = obj.addObj;
        this.sampleList = obj.sampleList;
        this.selectTree = obj.selectTree
        // backend already resolved the bound record templates by standard
        if (detail.standardTreeId) {
          this.$set(this.addObj, 'standardTreeId', detail.standardTreeId)
        }
        this.boundTemplateList = this.sortTemplateList(detail.templateBindings)
        this.rowClick(this.sampleList[0])
      })
    },