6

jinlin

2023-11-30 499dfffcf6e41f558e80f57e16860e6fb2bdcb31

 web/src/views/modules/itemCirculatOrder/ItemCirculatOrder-AddOrUpdate.vue

@@ -1,60 +1,258 @@
<template>
  <zt-dialog ref="dialog" column="2" @confirm="formSubmit">
    <el-form :model="dataForm" ref="dataForm" :disabled="dataForm.disabled" label-width="120px">
      <zt-form-item label="项目ID" prop="projectId" rules="required">
                        <el-input v-model="dataForm.projectId"></el-input>
                </zt-form-item>
      <zt-form-item label="物品流转单编号" prop="code" rules="required">
                        <el-input v-model="dataForm.code"></el-input>
                </zt-form-item>
      <zt-form-item label="物品其他要求" prop="itemRequire" rules="required">
                        <el-input v-model="dataForm.itemRequire"></el-input>
                </zt-form-item>
      <zt-form-item label="物品其他要求的其他" prop="itemOther" rules="required">
                        <el-input v-model="dataForm.itemOther"></el-input>
                </zt-form-item>
      <zt-form-item label="物品接收人" prop="itemAccept" rules="required">
                        <el-input v-model="dataForm.itemAccept"></el-input>
                </zt-form-item>
      <zt-form-item label="物品接收时间" prop="acceptDate" rules="required">
                        <el-input v-model="dataForm.acceptDate"></el-input>
                </zt-form-item>
      <zt-form-item label="物品接收情况说明" prop="acceptSituation" rules="required">
                        <el-input v-model="dataForm.acceptSituation"></el-input>
                </zt-form-item>
      <zt-form-item label="校准检测人" prop="calibratDetect" rules="required">
                        <el-input v-model="dataForm.calibratDetect"></el-input>
                </zt-form-item>
      <zt-form-item label="校准检测时间" prop="detectDate" rules="required">
                        <el-input v-model="dataForm.detectDate"></el-input>
                </zt-form-item>
      <zt-form-item label="校准检测情况说明" prop="detectSituation" rules="required">
                        <el-input v-model="dataForm.detectSituation"></el-input>
                </zt-form-item>
      <zt-form-item label="物品入库人" prop="warehouse" rules="required">
                        <el-input v-model="dataForm.warehouse"></el-input>
                </zt-form-item>
      <zt-form-item label="物品入库时间" prop="warehouseDate" rules="required">
                        <el-input v-model="dataForm.warehouseDate"></el-input>
                </zt-form-item>
      <zt-form-item label="物品入库情况" prop="warehouseSituation" rules="required">
                        <el-input v-model="dataForm.warehouseSituation"></el-input>
                </zt-form-item>
      <zt-form-item label="物品发放人" prop="itemIssue" rules="required">
                        <el-input v-model="dataForm.itemIssue"></el-input>
                </zt-form-item>
      <zt-form-item label="物品发放时间" prop="issueDate" rules="required">
                        <el-input v-model="dataForm.issueDate"></el-input>
                </zt-form-item>
      <zt-form-item label="物品发放情况说明" prop="issueSituation" rules="required">
                        <el-input v-model="dataForm.issueSituation"></el-input>
                </zt-form-item>
      <zt-form-item label="备注" prop="remark" rules="required">
                        <el-input v-model="dataForm.remark"></el-input>
                </zt-form-item>
      <zt-form-item label="年份" prop="year" rules="required">
                        <el-input v-model="dataForm.year"></el-input>
                </zt-form-item>
  <zt-dialog ref="dialog" column="3" :title="title" :stepMarker="stepMarker" @confirm="formSubmit">
    <el-form :model="dataForm" :inline="true" ref="dataForm" style="padding-top: 0" :disabled="dataForm.disabled"
             label-width="120px" class="circulationFormAuto">
      <div>
        <el-form-item label-width="60px" label="编号:" style="width:100%;margin-bottom: -5px">
          <span>{{dataForm.circulatOrder.code}}</span>
        </el-form-item>
      </div>
      <div style="border: 1px solid rgba(0,0,0,.2);width: 99%">
        <div style="border-bottom: 1px solid rgba(0,0,0,.2);" class="circulationContentWidth">
          <el-form-item class="marginTopAndMarginBottom" label="专业实验室" style="width: 32%">
            <el-input v-model="dataForm.testAgencyInfo.agencyName" placeholder="专业实验室"></el-input>
          </el-form-item>
          <el-form-item class="marginTopAndMarginBottom" label="任务编号" style="width: 32%">
            <el-input v-model="dataForm.project.softwareIdentity" placeholder="任务编号"></el-input>
          </el-form-item>
          <el-form-item class="marginTopAndMarginBottom" label="物品名称" style="width: 32%">
            <el-input v-model="dataForm.project.softwareName" placeholder="物品名称"></el-input>
          </el-form-item>
          <el-form-item class="marginTopAndMarginBottom3" label="型号" style="width: 32%">
            <zt-dict v-model="dataForm.project.softwareType" dict="is_embed_software" :radio="true"></zt-dict>
          </el-form-item>
          <el-form-item class="marginTopAndMarginBottom3" label="物品编号" style="width: 32%">
            <el-input v-model="dataForm.project.softwareIdentity" placeholder="物品编号"></el-input>
          </el-form-item>
          <el-form-item class="marginTopAndMarginBottom3" label="数 量" style="width: 32%">
            <el-input v-model="dataForm.project.isContract" placeholder="数量"></el-input>
          </el-form-item>
        </div>
        <div style="border-bottom: 1px solid rgba(0,0,0,.2);">
          <div style="padding-left:5px;padding-right:5px;">
            <div style="padding: 5px">物品技术资料及数量：</div>
            <div class="table-container">
              <el-table ref="tableCirculatOrderList" class="el-software el-margin-top-bot" border
                        :data="dataForm.technicalList"
                        stripe>
                <el-table-column prop="no" align="center" width="60" label="序号">
                  <template slot-scope="scope">
                    <span v-html="indexFormat(scope.$index)"></span>
                  </template>
                </el-table-column>
                <el-table-column prop="infoName" min-width="180" label="技术资料名称">
                  <template v-slot="{ row }">
                    <el-input v-model="row.name" placeholder="技术资料名称"></el-input>
                  </template>
                </el-table-column>
                <el-table-column prop="identify" align="center" width="150" label="标识">
                  <template v-slot="{ row }">
                    <el-input v-model="row.version" placeholder="标识"></el-input>
                  </template>
                </el-table-column>
                <el-table-column prop="version" align="center" width="120" label="版本">
                  <template v-slot="{ row }">
                    <el-input v-model="row.identify" placeholder="版本"></el-input>
                  </template>
                </el-table-column>
                <el-table-column prop="secretClass" label="密级" width="100" align="center">
                  <template v-slot="{ row }">
                    <!--                    <el-input v-model="row.secretClass" placeholder="密级"></el-input>-->
                    <zt-dict v-model="row.secretClass" dict="secret_class"></zt-dict>
                  </template>
                </el-table-column>
                <el-table-column prop="medium" label="介质" width="100" align="center">
                  <template v-slot="{ row }">
                    <el-input v-model="row.medium" placeholder="介质"></el-input>
                  </template>
                </el-table-column>
                <el-table-column prop="amount" label="数量" width="80" align="center">
                  <template v-slot="{ row }">
                    <el-input v-model="row.amount" placeholder="数量"></el-input>
                  </template>
                </el-table-column>
                <el-table-column prop="remark" label="备注" width="100" align="center">
                  <template v-slot="{ row }">
                    <el-input v-model="row.remark" placeholder="备注"></el-input>
                  </template>
                </el-table-column>
                <el-table-column fixed="right" prop="files" label="上传附件" width="300" align="center">
                  <template v-slot="{ row }">
                    <!--                    <zt-table-button @click="files(row.id)">上传附件</zt-table-button>-->
                    <table-uploader busi-type="circulat_order" model-name="row" :dataForm="row"
                                    v-model="row.files"/>
                  </template>
                </el-table-column>
              </el-table>
              <div class="icon-container" @click="addCirculatRow()">
                <!-- 放置固定的图标 -->
                <i class="el-icon-plus"></i>
              </div>
            </div>
          </div>
        </div>
        <div class="el-flexCirculationDialog el-border-bottom">
          <div style="width: 112px;text-align: center;font-weight: 600">
            物品的其它要求
          </div>
          <div style="width: calc(100% - 120px);">
            <div class="el-border-left">
              <el-form-item label="物品是否需要返还" label-width="150px" style="width:100%;padding-left:20px;margin-bottom:0">
                <zt-dict v-model="dataForm.circulatOrder.itemRequire" :radio="true"
                         dict="is_or_not"></zt-dict>
              </el-form-item>
              <el-form-item label="物品的其他要求：" label-width="150px" style="width:100%;padding-left:20px;margin-bottom:0">
                <el-input v-model="dataForm.circulatOrder.itemOther"></el-input>
              </el-form-item>
            </div>
          </div>
        </div>
        <div class="el-flexCirculationDialog el-border-bottom">
          <div style="width: 112px;text-align: center;font-weight: 600">
            物品接收人
          </div>
          <div class="el-border-left-right acceptDate" style="width: 20%;;height: 80px;">
            <el-form-item style="width: 100%;padding-left:20px;margin:0;">
              {{dataForm.circulatOrder.itemAcceptor}}
            </el-form-item>
          </div>
          <div style="width: 52px;text-align: center;font-weight: 600">
            时间
          </div>
          <div class="el-border-left-right acceptDate" style="width: 20%;height: 80px;">
            <el-form-item style="width: 100%;padding-left:20px;margin:0;">
              {{ dataForm.circulatOrder.acceptDate | filterTime('YYYY年MM月DD日') }}
            </el-form-item>
          </div>
          <div style="width: 84px;text-align: center;font-weight: 600">
            情况说明
          </div>
          <div class="el-border-left " style="width: 35%;height: 80px;">
            <el-form-item label="是否完成病毒查杀" label-width="150px" style="padding-left:20px;margin-bottom:0">
              <zt-dict v-model="dataForm.circulatOrder.acceptSituation" :radio="true" dict="is_or_not"></zt-dict>
            </el-form-item>
            <el-form-item label="病毒库版本：" label-width="150px" style="width:100%;padding-left:20px;margin-bottom:0">
              <el-input v-model="dataForm.circulatOrder.virusLibraryVersion"></el-input>
            </el-form-item>
          </div>
        </div>
        <!--<div class="el-flexCirculationDialog el-border-bottom">
          <div style="width: 112px;text-align: center;font-weight: 600">
            校准/检测接收人
          </div>
          <div class="el-border-left-right" style="width: 20%;height: 40px;">
            <el-form-item style="width: 100%;padding-left:20px;margin:0;">
              {{dataForm.circulatOrder.itemAccept}}
            </el-form-item>
          </div>
          <div style="width: 52px;text-align: center;font-weight: 600">
            时间
          </div>
          <div class="el-border-left-right" style="width: 20%;height: 40px;">
            <el-form-item style="width: 100%;padding-left:20px;margin:0;">
              {{dataForm.circulatOrder.acceptDate}}
            </el-form-item>
          </div>
          <div style="width: 84px;text-align: center;font-weight: 600">
            情况说明
          </div>
          <div class="el-border-left " style="width: 35%;height: 40px;">
            <el-form-item label="是否满足测试要求" label-width="150px" style="padding-left:20px;margin-bottom:0">
              <zt-dict v-model="dataForm.circulatOrder.cscs" :radio="true" dict="is_or_not"></zt-dict>
            </el-form-item>
          </div>
        </div>-->
        <div class="el-flexCirculationDialog el-border-bottom">
          <div style="width: 112px;text-align: center;font-weight: 600">
            校准检测人
          </div>
          <div class="el-border-left-right" style="width: 20%;height: 40px;">
            <el-form-item style="width: 100%;padding-left:20px;margin:0;">
              {{dataForm.circulatOrder.calibratDetector}}
            </el-form-item>
          </div>
          <div style="width: 52px;text-align: center;font-weight: 600">
            时间
          </div>
          <div class="el-border-left-right" style="width: 20%;height: 40px;">
            <el-form-item style="width: 100%;padding-left:20px;margin:0;">
<!--              {{dataForm.circulatOrder.detectDate}}-->
              {{ dataForm.circulatOrder.detectDate | filterTime('YYYY年MM月DD日') }}
            </el-form-item>
          </div>
          <div style="width: 84px;text-align: center;font-weight: 600">
            情况说明
          </div>
          <div class="el-border-left " style="width: 35%;height: 40px;">
            <el-form-item label="是否满足测试要求" label-width="150px" style="padding-left:20px;margin-bottom:0">
              <zt-dict v-model="dataForm.circulatOrder.detectSituation" :radio="true" dict="is_or_not"></zt-dict>
            </el-form-item>
          </div>
        </div>
       <!-- <div class="el-flexCirculationDialog el-border-bottom">
          <div style="width: 112px;text-align: center;font-weight: 600">
            物品入库人
          </div>
          <div class="el-border-left-right" style="width: 20%;height: 40px;">
            <el-form-item style="width: 100%;padding-left:20px;margin:0;">
              {{dataForm.circulatOrder.warehouse}}
            </el-form-item>
          </div>
          <div style="width: 52px;text-align: center;font-weight: 600">
            时间
          </div>
          <div class="el-border-left-right" style="width: 20%;height: 40px;">
            <el-form-item style="width: 100%;padding-left:20px;margin:0;">
              {{dataForm.circulatOrder.warehouseDate}}
            </el-form-item>
          </div>
          <div style="width: 84px;text-align: center;font-weight: 600">
            情况说明
          </div>
          <div class="el-border-left " style="width: 35%;height: 40px;">
            <el-form-item label="是否满足测试要求" label-width="150px" style="padding-left:20px;margin-bottom:0">
              <zt-dict v-model="dataForm.circulatOrder.warehouseSituation" :radio="true" dict="is_or_not"></zt-dict>
            </el-form-item>
          </div>
        </div>-->
        <div class="el-flexCirculationDialog el-border-bottom">
          <div style="width: 112px;text-align: center;font-weight: 600">
            物品发放人
          </div>
          <div class="el-border-left-right " style="width: 20%;height: 40px;">
            <el-form-item style="width: 100%;padding-left:20px;margin:0;">
              {{dataForm.circulatOrder.itemIssuer}}
            </el-form-item>
          </div>
          <div style="width: 52px;text-align: center;font-weight: 600">
            时间
          </div>
          <div class="el-border-left-right " style="width: 20%;height: 40px;">
            <el-form-item style="width: 100%;padding-left:20px;margin:0;">
<!--              {{dataForm.circulatOrder.issueDate}}-->
              {{ dataForm.circulatOrder.issueDate | filterTime('YYYY年MM月DD日') }}
            </el-form-item>
          </div>
          <div style="width: 84px;text-align: center;font-weight: 600">
            情况说明
          </div>
          <div class="el-border-left " style="width: 35%;height: 40px;">
            <el-form-item label="是否完成样品发放" label-width="150px" style="padding-left:20px;margin-bottom:0">
              <zt-dict v-model="dataForm.circulatOrder.issueSituation" :radio="true" dict="is_or_not"></zt-dict>
            </el-form-item>
          </div>
        </div>
        <div class="el-flexCirculationDialog">
          <div style="width: 112px;text-align: center;font-weight: 600">
            备注
          </div>
          <div class="el-border-left " style="width: 20%;height: 40px">
            <el-form-item style="width: 100%;padding-left:20px;margin:0;">
              <el-input v-model="dataForm.circulatOrder.itemAcceptr"></el-input>
            </el-form-item>
          </div>
        </div>
      </div>
    </el-form>
  </zt-dialog>
</template>
@@ -63,42 +261,112 @@
  export default {
    data() {
      return {
        stepMarker: '',
        title: '查看',
        dataForm: {
          id: '',
          projectId: '',
          code: '',
          itemRequire: '',
          itemOther: '',
          itemAccept: '',
          acceptDate: '',
          acceptSituation: '',
          calibratDetect: '',
          detectDate: '',
          detectSituation: '',
          warehouse: '',
          warehouseDate: '',
          warehouseSituation: '',
          itemIssue: '',
          issueDate: '',
          issueSituation: '',
          remark: '',
          year: ''
          circulatOrder: {
            code: '1',
            itemAccept: '',
            itemRequire: '',
            itemOther: '',
            acceptSituation: '',
            acceptDate: '',
            calibratDetector: '',
            detectDate: '',
            detectSituation: '',
            warehouse: '',
            warehouseDate: '',
            warehouseSituation: '',
            itemIssuer: '',
            issueDate: '',
            issueSituation: '',
            remark: '',
            virusLibraryVersion:'',
            itemAcceptor:''
          },
          project: {
            softwareIdentity: '',
            softwareName: '',
          },
          testAgencyInfo: {
            agencyName: '',
          },
          technicalList: [],
          flowInfoDto: {}
        }
      }
    },
    methods: {
      indexFormat(index) {
        return index += 1
      },
      init(id, row) {
        if (id) {
          this.dataForm.id = id
        } else {
          this.dataForm.id = row.id
        }
        this.dataForm.projectId = row.projectId
        // this.dataForm.disabled
        this.getInfo()
        if (!this.dataForm.disabled) {
          if (!row.stepMarker) {
            this.stepMarker = 'wplz_first'
            this.title = '物品接收'
          } else {
            this.title = row.stepName
            this.stepMarker = row.stepMarker
          }
        }
        console.log(this.dataForm.id, this.dataForm.projectId, this.stepMarker, 'this.dataForm.id, this.dataForm.projectId,this.stepMarker')
      },
      addCirculatRow() {
        this.dataForm.technicalList.push({})
        this.$nextTick(() => {
          const tableBody = this.$refs.tableCirculatOrderList.$el.querySelector('.el-table__body-wrapper')
          tableBody.scrollTop = tableBody.scrollHeight;
        })
      },
      // 获取信息
      async getInfo() {
        let res = await this.$http.get(`/itemCirculatOrder/ItemCirculatOrder/${this.dataForm.id}`)
        let params = {
          circulatOrderid: this.dataForm.id,
          projectId: this.dataForm.projectId
        }
        let res = await this.$http.get(`/itemCirculatOrder/ItemCirculatOrder/getDto`, {params: params})
        this.dataForm = {
          ...this.dataForm,
          ...res.data
        }
        console.log(this.dataForm, "getInfo this.dataForm")
      },
      // 表单提交
      async formSubmit() {
      async formSubmit(submitType) {
        console.log(this.dataForm, "this.dataForm11111")
        if (submitType == 'tj' || submitType == 'bl') {
          let flowInfo = {
            flowCode: 'wplz',
            stepIdMark: this.stepMarker,
            submitType: submitType
          }
          this.dataForm.flowInfoDto = flowInfo;
        }
        let res = await this.$http[!this.dataForm.id ? 'post' : 'put']('/itemCirculatOrder/ItemCirculatOrder/', this.dataForm)
        if (res.success) {
          /*      if (submitType == 'tj') {
                      console.log(res, 'bbbb')
                      let res2 = await this.$http.get('/wf/startFlow', submitForm)
                      if (res2.success) {
                        let res3 = await this.$http.get('/wf/approvePass', submitForm)
                        if (res3.success) {
                        }
                      }
                    } else if (submitType == 'bl') {
                      let res2 = await this.$http.get('/wf/approvePass', submitForm)
                      if (res2.success) {
                      }
                    }*/
          await this.$tip.success()
          this.$refs.dialog.close()
          this.$emit('refreshDataList')
@@ -107,3 +375,40 @@
    }
  }
</script>
<style>
  .el-flexCirculationDialog {
    display: flex;
    align-items: center
  }

  .circulationContentWidth > .el-form-item > .el-form-item__content {
    width: calc(100% - 120px);
  }

  .circulationContentWidth > .el-form-item.lastChild > .el-form-item__content {
    width: calc(100% - 142px);
  }

  .circulationFormAuto .marginTopAndMarginBottom {
    margin-top: 10px !important;
    margin-bottom: 0 !important;
  }

  .circulationFormAuto .marginTopAndMarginBottom2 {
    margin-top: -10px !important;
    margin-bottom: 10px !important;
  }

  .circulationFormAuto .marginTopAndMarginBottom3 {
    margin-top: 0 !important;
    margin-bottom: 10px !important;
  }

  .acceptDate > .el-form-item > .el-form-item__content {
    line-height: 80px;
  }

  .circulationFormAuto .el-radio {
    margin-right: 10px;
  }
</style>