合同评审及基线表

wente

2023-12-19 d242e5472638bb89b48c492514f5fec4df876464

合同评审及基线表

 web/src/views/modules/baselineRelease/BaselineRelease-AddOrUpdate.vue

@@ -1,43 +1,90 @@
<template>
  <zt-dialog ref="dialog" column="2" @confirm="formSubmit" :stepMarker="stepMarker" :append-to-body="true">
    <el-form :model="dataForm" :inline="true" ref="dataForm" style="padding-top: 0" :disabled="dataForm.disabled"
             label-width="120px" class="testCheckFormAuto">
             label-width="120px" class="baselineFormAuto">
      <div>
        <el-form-item label-width="60px" label="编号:" style="width:100%;margin-bottom: -5px">
          <span>{{ dataForm.baseline.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="testCheckContentWidth">
          <el-form-item class="marginTopAndMarginBottom" label="项目标识" style="width: 49%">
<!--        <div style="border-bottom: 1px solid rgba(0,0,0,.2);" class="baselineContentWidth">-->
<!--          <el-form-item class="marginTopAndMarginBottom" label="项目标识" style="width: 49%">-->
<!--            <el-input v-model="dataForm.project.softwareIdentity" placeholder="项目标识"></el-input>-->
<!--          </el-form-item>-->
<!--          <el-form-item class="marginTopAndMarginBottom" label="项目名称" style="width: 49%">-->
<!--            <el-input v-model="dataForm.project.softwareName" placeholder="项目名称"></el-input>-->
<!--          </el-form-item>-->
<!--        </div>-->
        <div class="el-flexBaselineDialog el-border-bottom">
          <div style="width: 120px;text-align: center;font-weight: 600">
            项目标识
          </div>
          <div class="el-border-left-right acceptDate1" style="width: 38%;height: 40px;">
            <el-form-item style="width: 100%;padding: 0 5px;margin:0;">
            <el-input v-model="dataForm.project.softwareIdentity" placeholder="项目标识"></el-input>
          </el-form-item>
          <el-form-item class="marginTopAndMarginBottom" label="项目名称" style="width: 49%">
          </div>
          <div style="width: 120px;text-align: center;font-weight: 600">
            项目名称
          </div>
          <div class="el-border-left acceptDate1" style="width: 38%;height: 40px;">
            <el-form-item style="width: 100%;padding: 0 5px;margin:0;">
            <el-input v-model="dataForm.project.softwareName" placeholder="项目名称"></el-input>
          </el-form-item>
        </div>
        </div>
        <div style="border-bottom: 1px solid rgba(0,0,0,.2);">
          <div style="padding-left:5px;padding-right:5px;">
            <div style="width: 112px;text-align: center;font-weight: 600">基线发布描述</div>
            <div class="table-container">
              <el-form-item class="marginTopAndMarginBottom" label="基线类型" style="width: 49%">
          <div style="width: 100%;">
              <div class="DHold" style="border-bottom: 1px solid rgba(0,0,0,.2);height: 40px;line-height: 40px">基线发布描述</div>
              <div class="el-flexBaselineDialog el-border-bottom">
                <div class="DWidth DAlign DHold">
                  基线类型
                </div>
                <div class="el-border-left" style="width: calc(100% - 120px)">
                  <el-form-item style="padding-left:5%;margin-bottom:0">
                <zt-dict  v-model="dataForm.baseline.baselineType" placeholder="基线类型" dict="baseline_type"
                          :radio="true"></zt-dict>
              </el-form-item>
              <el-form-item class="marginTopAndMarginBottom" label="基线名称" style="width: 49%">
                </div>
              </div>
<!--              <el-form-item class="marginTopAndMarginBottom" label="基线类型" style="width: 49%">-->
<!--                <zt-dict  v-model="dataForm.baseline.baselineType" placeholder="基线类型" dict="baseline_type"-->
<!--                          :radio="true"></zt-dict>-->
<!--              </el-form-item>-->
              <div class="el-flexBaselineDialog el-border-bottom">
                <div class="DWidth DAlign DHold">
                  基线名称
                </div>
                <div class="el-border-left acceptDate1" style="width: calc(100% - 120px)">
                  <el-form-item style="width: 100%;margin-bottom:0">
                <el-input v-model="dataForm.baseline.baselineName" placeholder="基线名称"></el-input>
              </el-form-item>
              <el-form-item class="marginTopAndMarginBottom" label="基线版本" style="width: 49%">
                </div>
              </div>
<!--              <el-form-item class="marginTopAndMarginBottom" label="基线名称" style="width: 49%">-->
<!--                <el-input v-model="dataForm.baseline.baselineName" placeholder="基线名称"></el-input>-->
<!--              </el-form-item>-->
              <div class="el-flexBaselineDialog">
                <div class="DWidth DAlign DHold">
                  基线版本
                </div>
                <div class="el-border-left acceptDate1" style="width: calc(100% - 120px)">
                  <el-form-item  style="width: 100%;margin-bottom:0">
                <el-input v-model="dataForm.baseline.baselineVersion" placeholder="基线版本"></el-input>
              </el-form-item>
            </div>
          </div>
<!--              <el-form-item class="marginTopAndMarginBottom" label="基线版本" style="width: 49%">-->
<!--                <el-input v-model="dataForm.baseline.baselineVersion" placeholder="基线版本"></el-input>-->
<!--              </el-form-item>-->
        </div>
        <div class="el-flexCirculationDialog el-border-bottom">
          <div style="width: 112px;text-align: center;font-weight: 600">
        </div>
        <div class="el-flexBaselineDialog el-border-bottom">
          <div style="width: 120px;text-align: center;font-weight: 600">
            备注
          </div>
          <div class="el-border-left acceptDate" style="height: 80px;width: 80%;">
          <div class="el-border-left acceptDate" style="width: calc(100% - 120px);">
            <div class="table-container">
              <el-table ref="tableCirculatOrderList" class="el-software el-margin-top-bot" border
                        :data="dataForm.remarkList"
@@ -57,41 +104,39 @@
            </div>
          </div>
        </div>
        <div class="el-flexCirculationDialog">
          <div style="width: 112px;text-align: center;font-weight: 600">
        <div class="el-flexBaselineDialog el-border-bottom">
          <div style="width: 120px;text-align: center;font-weight: 600">
            发布人
          </div>
          <div class="el-border-left-right acceptDate1" style="width: 40%;height: 40px;">
          <div class="el-border-left-right acceptDate1" style="width: 38%;height: 40px;">
            <el-form-item style="width: 100%;padding-left:20px;margin:0;">
              <span>{{ dataForm.baseline.publisher}}</span>
            </el-form-item>
          </div>
          <div style="width: 112px;text-align: center;font-weight: 600">
          <div style="width: 120px;text-align: center;font-weight: 600">
            发布时间
          </div>
          <div class="el-border-left-right acceptDate1" style="width: 40%;height: 40px;">
          <div class="el-border-left acceptDate1" style="width: 38%;height: 40px;">
            <el-form-item style="width: 100%;padding-left:20px;margin:0;">
              <span>{{ dataForm.baseline.publishDate}}</span>
            </el-form-item>
          </div>
          <div style="width: 84px;text-align: center;font-weight: 600">
           基线批准
          </div>
          <div class="el-configChangeDialog el-border-bottom">
            <div class="DFormWidth DAlign DHold">
          <div class="DHold" style="border-bottom: 1px solid rgba(0,0,0,.2);height: 40px;line-height: 40px">基线批准</div>
          <div class="el-flexBaselineDialog el-border-bottom">
            <div class="DWidth DAlign DHold">
              部门意见
            </div>
            <div style="width: calc(100% - 120px)" class="el-border-left">
              <el-form-item class="el-wt-form-item-margin" label-width="20px" style="width: 85%">
                <el-input :disabled="stepMarker!=='pzxbg_bmsh'" v-model="dataForm.baseline.departOpinion"></el-input>
              <el-form-item class="wt-form-item" label-width="20px" style="width: 100%;padding: 5px">
                <el-input type="textarea" :rows="2" :disabled="stepMarker!=='pzxbg_bmsh'" v-model="dataForm.baseline.departOpinion"></el-input>
              </el-form-item>
              <el-form-item label-width="80%" label="签字：" style="width: 65%">
              <el-form-item label-width="275px" label="签字：" style="width: 45%">
                <span>{{dataForm.baseline.departSign}}</span>
              </el-form-item>
              <el-form-item label="日期：" style="width: 20%">
              <el-form-item label-width="240px" label="日期：" style="width: 45%">
                <span>{{dataForm.baseline.signDate}}</span>
              </el-form-item>
            </div>
          </div>
        </div>
      </div>
@@ -117,7 +162,9 @@
        dataForm: {
          id: '',
          pageCode: '',
          projectId:'',
          stepMarker: '',
          configChangeList:[],
          pageName: {
            demand: '需求基线', product:'产品基线'
          },
@@ -231,3 +278,52 @@
    }
  }
</script>
<style>
.el-flexBaselineDialog {
  display: flex;
  align-items: center
}
.DWidth{
  width: 120px;
}
.baselineFormAuto .acceptDate > .el-form-item > .el-form-item__content {
  width: 100%;
}

.baselineFormAuto .acceptDate1 > .el-form-item > .el-form-item__content {
  width: 100%;
}

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

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

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

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

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

.baselineFormAuto .el-radio {
  margin-right: 10px;
}
.wt-form-item .el-form-item__content{
  width: 100%;
}
.DHold{
  font-weight: 600;
}
</style>

 web/src/views/modules/contractReview/ContractReview-AddOrUpdate.vue

@@ -22,7 +22,7 @@
            <span>{{ dataForm.contractReview.orderCode }}</span>
          </el-form-item>
        </div>
        <div class="el-flexManageDialog el-border-bottom">
        <div class="el-flexContractDialog el-border-bottom">
          <div class="DFormWidth DAlign DHold">
            评审项目
          </div>
@@ -31,17 +31,17 @@
              <el-table ref="tableConfigItemList" class="el-software el-margin-top-bot"
                        style="width: 99%;margin-left: 5px" border :data="dataForm.reviewItemList"
                        stripe>
                <el-table-column prop="no" align="center" width="60" >
                <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="item" min-width="400" >
                <el-table-column prop="item" min-width="400" label="评审项">
                  <template v-slot="{ row }">
                    <el-input v-model="row.item" placeholder="评审项"></el-input>
                  </template>
                </el-table-column>
                <el-table-column prop="result"  width="180" align="center">
                <el-table-column prop="result"  width="220" align="center" label="评审结果">
                  <template v-slot="{ row }">
                    <zt-dict v-model="row.result" placeholder="评审结果" dict="tristate1" :radio="true"
                             clearable></zt-dict>
@@ -51,7 +51,7 @@
            </div>
          </div>
        </div>
        <div class="el-flexManageDialog el-border-bottom">
        <div class="el-flexContractDialog el-border-bottom">
          <div class="DFormWidth DAlign DHold">
            评审记录
          </div>
@@ -62,7 +62,7 @@
            </el-form-item>
          </div>
        </div>
        <div class="el-flexManageDialog el-border-bottom">
        <div class="el-flexContractDialog el-border-bottom">
          <div class="DFormWidth DAlign DHold">
            客户的特殊要求
          </div>
@@ -73,7 +73,7 @@
            </el-form-item>
          </div>
        </div>
        <div class="el-flexManageDialog el-border-bottom">
        <div class="el-flexContractDialog el-border-bottom">
          <div class="DFormWidth DAlign DHold">
            分包
          </div>
@@ -84,7 +84,7 @@
            </el-form-item>
          </div>
        </div>
        <div class="el-flexManageDialog el-border-bottom">
        <div class="el-flexContractDialog el-border-bottom">
          <div class="DFormWidth DAlign DHold">
            评审结论
          </div>
@@ -106,7 +106,7 @@
            </el-form-item>
          </div>
        </div>
        <div class="el-flexManageDialog">
        <div class="el-flexContractDialog">
          <div class="DFormWidth DAlign DHold">
            评审组成员
          </div>
@@ -227,7 +227,7 @@
  border: 1px solid;
}

.el-flexManageDialog {
.el-flexContractDialog {
  display: flex;
  align-items: center;
}

 web/src/views/modules/contractReview/ContractReview.vue

@@ -16,10 +16,10 @@
          </el-form-item>
        </el-form>
        <el-table v-loading="table.dataLoading" :data="table.dataList" height="100px" v-adaptive="{bottomOffset:70}" border @selection-change="table.selectionChangeHandle">
          <el-table-column type="selection" width="40"/>
          <el-table-column align="center" type="selection" width="40"/>
            <el-table-column prop="code" label="编号"/>
          <zt-table-column-dict prop="reviewType" width="150px" label="评审阶段" dict="review_type"/>
          <el-table-column prop="orderCode" width="250px" label="委托单编号"/>
          <el-table-column prop="orderCode" label="委托单编号"/>
          <zt-table-column-handle :table="table" edit-perm="contractReview:update" delete-perm="contractReview::delete"/>
        </el-table>
        <!-- 弹窗, 新增 / 修改 -->