6

jinlin

2023-11-29 b21945e7dea2daa8b30bee3cdd4bca91277e3b5f

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

@@ -1,6 +1,7 @@
<template>
  <zt-dialog ref="dialog" column="3" @confirm="formSubmit">
    <el-form :model="dataForm" :inline="true" ref="dataForm" style="padding-top: 0" :disabled="dataForm.disabled" label-width="120px" class="circulationFormAuto">
  <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>
@@ -31,7 +32,8 @@
          <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"
              <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">
@@ -111,7 +113,7 @@
          </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.itemAccept}}
              {{dataForm.circulatOrder.itemAcceptor}}
            </el-form-item>
          </div>
          <div style="width: 52px;text-align: center;font-weight: 600">
@@ -130,11 +132,11 @@
              <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.itemOther"></el-input>
              <el-input v-model="dataForm.circulatOrder.virusLibraryVersion"></el-input>
            </el-form-item>
          </div>
        </div>
        <div class="el-flexCirculationDialog el-border-bottom">
        <!--<div class="el-flexCirculationDialog el-border-bottom">
          <div style="width: 112px;text-align: center;font-weight: 600">
            校准/检测接收人
          </div>
@@ -159,14 +161,14 @@
              <zt-dict v-model="dataForm.circulatOrder.cscs" :radio="true" dict="is_or_not"></zt-dict>
            </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" style="width: 20%;height: 40px;">
            <el-form-item  style="width: 100%;padding-left:20px;margin:0;">
              {{dataForm.circulatOrder.calibratDetect}}
              {{dataForm.circulatOrder.calibratDetector}}
            </el-form-item>
          </div>
          <div style="width: 52px;text-align: center;font-weight: 600">
@@ -186,7 +188,7 @@
            </el-form-item>
          </div>
        </div>
        <div class="el-flexCirculationDialog el-border-bottom">
       <!-- <div class="el-flexCirculationDialog el-border-bottom">
          <div style="width: 112px;text-align: center;font-weight: 600">
            物品入库人
          </div>
@@ -211,14 +213,14 @@
              <zt-dict v-model="dataForm.circulatOrder.warehouseSituation" :radio="true" dict="is_or_not"></zt-dict>
            </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 " style="width: 20%;height: 40px;">
            <el-form-item  style="width: 100%;padding-left:20px;margin:0;">
              {{dataForm.circulatOrder.itemIssue}}
              {{dataForm.circulatOrder.itemIssuer}}
            </el-form-item>
          </div>
          <div style="width: 52px;text-align: center;font-weight: 600">
@@ -244,57 +246,10 @@
          </div>
          <div class="el-border-left " style="width: 20%;height: 40px">
            <el-form-item  style="width: 100%;padding-left:20px;margin:0;">
              {{dataForm.circulatOrder.itemAccept}}
              <el-input v-model="dataForm.circulatOrder.itemAcceptr"></el-input>
            </el-form-item>
          </div>
        </div>
<!--          <div class="circulationContentWidth">
            <el-form-item class="marginTopAndMarginBottom" label="物品接收人" style="width: 32%">
              <el-input v-model="dataForm.circulatOrder.itemAccept" placeholder="物品接收人"></el-input>
            </el-form-item>
            <el-form-item class="marginTopAndMarginBottom" label="时间" style="width: 32%">
              <el-input v-model="dataForm.circulatOrder.acceptDate" placeholder="时间"></el-input>
            </el-form-item>
            <el-form-item class="marginTopAndMarginBottom" label="情况说明" style="width: 32%">
              <span>是否完成病毒查杀：
               <zt-dict v-model="dataForm.circulatOrder.acceptSituation" :radio="true" dict="is_or_not"></zt-dict>
              </span>
              <span>病毒库版本：<el-input v-model="dataForm.circulatOrder.acceptSituation" placeholder="病毒库版本"></el-input></span>
            </el-form-item>
            <el-form-item class="marginTopAndMarginBottom3" label="校准检测人" style="width: 32%">
              <el-input v-model="dataForm.circulatOrder.calibratDetect" placeholder="校准检测人"></el-input>
            </el-form-item>
            <el-form-item class="marginTopAndMarginBottom3" label="时间" style="width: 32%">
              <el-input v-model="dataForm.circulatOrder.detectDate" placeholder="时间"></el-input>
            </el-form-item>
            <el-form-item class="marginTopAndMarginBottom3" label="情况说明" style="width: 32%">
&lt;!&ndash;              <el-input v-model="dataForm.circulatOrder.detectSituation" placeholder="情况说明"></el-input>&ndash;&gt;
              <zt-dict v-model="dataForm.circulatOrder.detectSituation" :radio="true" dict="is_or_not"></zt-dict>
            </el-form-item>
            <el-form-item class="marginTopAndMarginBottom2" label="物品入库人" style="width: 32%">
              <el-input v-model="dataForm.circulatOrder.warehouse" placeholder="物品入库人"></el-input>
            </el-form-item>
            <el-form-item class="marginTopAndMarginBottom2" label="时间" style="width: 32%">
              <el-input v-model="dataForm.circulatOrder.warehouseDate" placeholder="时间"></el-input>
            </el-form-item>
            <el-form-item class="marginTopAndMarginBottom2" label="情况说明" style="width: 32%">
&lt;!&ndash;              <el-input v-model="dataForm.circulatOrder.warehouseSituation" placeholder="情况说明"></el-input>&ndash;&gt;
              <zt-dict v-model="dataForm.circulatOrder.warehouseSituation" :radio="true" dict="is_or_not"></zt-dict>
            </el-form-item>
            <el-form-item class="marginTopAndMarginBottom2" label="物品发放人" style="width: 32%">
              <el-input v-model="dataForm.circulatOrder.itemIssue" placeholder="物品发放人"></el-input>
            </el-form-item>
            <el-form-item class="marginTopAndMarginBottom2" label="时间" style="width: 32%">
              <el-input v-model="dataForm.circulatOrder.issueDate" placeholder="时间"></el-input>
            </el-form-item>
            <el-form-item class="marginTopAndMarginBottom2" label="情况说明" style="width: 32%">
&lt;!&ndash;              <el-input v-model="dataForm.circulatOrder.issueSituation" placeholder="情况说明"></el-input>&ndash;&gt;
              <zt-dict v-model="dataForm.circulatOrder.issueSituation" :radio="true" dict="is_or_not"></zt-dict>
            </el-form-item>
            <el-form-item  class="marginTopAndMarginBottom2 lastChild" label="备注" style="width: 100%">
              <el-input v-model="dataForm.circulatOrder.remark" placeholder="备注"></el-input>
            </el-form-item>
          </div>-->
      </div>
    </el-form>
  </zt-dialog>
@@ -304,6 +259,8 @@
  export default {
    data() {
      return {
        stepMarker: '',
        title: '查看',
        dataForm: {
          id: '',
          circulatOrder:{
@@ -313,16 +270,18 @@
            itemOther:'',
            acceptSituation:'',
            acceptDate: '',
            calibratDetect: '',
            calibratDetector: '',
            detectDate: '',
            detectSituation: '',
            warehouse: '',
            warehouseDate: '',
            warehouseSituation: '',
            itemIssue: '',
            itemIssuer: '',
            issueDate: '',
            issueSituation: '',
            remark: '',
            virusLibraryVersion:'',
            itemAcceptor:''
          },
          project: {
            softwareIdentity: '',
@@ -331,7 +290,8 @@
          testAgencyInfo: {
            agencyName:'',
          },
          technicalList:[]
          technicalList: [],
          flowInfoDto: {}
        }
      }
    },
@@ -340,11 +300,24 @@
        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()
        console.log(this.dataForm.id,this.dataForm.projectId,'params params')
        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({})
@@ -367,15 +340,35 @@
        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')
        }

      }
    }
  }
@@ -385,12 +378,15 @@
  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;
@@ -400,13 +396,16 @@
  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;
}